fix main
All checks were successful
PikaOS Package Build & Release (Canary) (amd64-v3) / build (push) Successful in 1m2s

This commit is contained in:
Ward from fusion-voyager-3 2024-07-24 14:00:28 +03:00
parent d704e5e2a0
commit aba9bc5d66
14 changed files with 51 additions and 46 deletions

View File

@ -1 +1 @@
4 1

View File

@ -30,5 +30,8 @@ jobs:
- name: Update APT Cache - name: Update APT Cache
run: apt-get update -y run: apt-get update -y
- name: Set Build Config
run: cp -vf ./pika-build-config/i386.sh ./pika-build-config.sh
- name: Build Package - name: Build Package
run: ./maini386.sh run: ./main.sh

View File

@ -30,5 +30,8 @@ jobs:
- name: Update APT Cache - name: Update APT Cache
run: apt-get update -y run: apt-get update -y
- name: Set Build Config
run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
- name: Build Package - name: Build Package
run: ./mainv3.sh run: ./main.sh

View File

@ -30,5 +30,8 @@ jobs:
- name: Update APT Cache - name: Update APT Cache
run: apt-get update -y run: apt-get update -y
- name: Set Build Config
run: cp -vf ./pika-build-config/i386.sh ./pika-build-config.sh
- name: Build Package - name: Build Package
run: ./maini386.sh run: ./main.sh

View File

@ -30,5 +30,8 @@ jobs:
- name: Update APT Cache - name: Update APT Cache
run: apt-get update -y run: apt-get update -y
- name: Set Build Config
run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
- name: Build Package - name: Build Package
run: ./mainv3.sh run: ./main.sh

View File

@ -30,8 +30,11 @@ jobs:
- name: Update APT Cache - name: Update APT Cache
run: apt-get update -y run: apt-get update -y
- name: Set Build Config
run: cp -vf ./pika-build-config/i386.sh ./pika-build-config.sh
- name: Build Package - name: Build Package
run: ./maini386.sh run: ./main.sh
- name: Release Package - name: Release Package
run: ./release.sh run: ./release.sh

View File

@ -30,8 +30,11 @@ jobs:
- name: Update APT Cache - name: Update APT Cache
run: apt-get update -y run: apt-get update -y
- name: Set Build Config
run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
- name: Build Package - name: Build Package
run: ./mainv3.sh run: ./main.sh
- name: Release Package - name: Release Package
run: ./release.sh run: ./release.sh

View File

@ -30,8 +30,11 @@ jobs:
- name: Update APT Cache - name: Update APT Cache
run: apt-get update -y run: apt-get update -y
- name: Set Build Config
run: cp -vf ./pika-build-config/i386.sh ./pika-build-config.sh
- name: Build Package - name: Build Package
run: ./maini386.sh run: ./main.sh
- name: Release Package - name: Release Package
run: ./release.sh run: ./release.sh

View File

@ -30,8 +30,11 @@ jobs:
- name: Update APT Cache - name: Update APT Cache
run: apt-get update -y run: apt-get update -y
- name: Set Build Config
run: cp -vf ./pika-build-config/amd64-v3.sh ./pika-build-config.sh
- name: Build Package - name: Build Package
run: ./mainv3.sh run: ./main.sh
- name: Release Package - name: Release Package
run: ./release.sh run: ./release.sh

View File

@ -4,11 +4,9 @@ set -e
source ./version.sh source ./version.sh
DRIVER_ARCH="Linux-x86_64" source ./pika-build-config.sh
export DEBIAN_FRONTEND="noninteractive" echo "$PIKA_BUILD_ARCH" > pika-build-arch
export DEB_BUILD_OPTIONS="nocheck notest terse"
export DPKG_GENSYMBOLS_CHECK_LEVEL=0
# Get nvidia run file # Get nvidia run file
cd ./nvidia-graphics-drivers-"$DRIVER_VERSION_MAJOR" cd ./nvidia-graphics-drivers-"$DRIVER_VERSION_MAJOR"

View File

@ -1,33 +0,0 @@
#! /bin/bash
set -e
source ./version.sh
DRIVER_ARCH="Linux-x86_64"
export DEBIAN_FRONTEND="noninteractive"
export DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
export DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
export DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
export DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
export DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
export DEB_BUILD_OPTIONS="nocheck notest terse"
export DPKG_GENSYMBOLS_CHECK_LEVEL=0
# Get nvidia run file
cd ./nvidia-graphics-drivers-"$DRIVER_VERSION_MAJOR"
wget https://us.download.nvidia.com/XFree86/$DRIVER_ARCH/$DRIVER_VERSION_FULL/NVIDIA-$DRIVER_ARCH-$DRIVER_VERSION_FULL.run -O nvidia-installer.run
chmod +x nvidia-installer.run
# Get build deps
apt-get build-dep ./ -y
# Build package
LOGNAME=root dh_make --createorig -y -l -p nvidia-graphics-drivers-"$DRIVER_VERSION_MAJOR"_"$DRIVER_VERSION_FULL" || true
dpkg-buildpackage --no-sign
# Move the debs to output
cd ../
mkdir -p ./output
mv ./*.deb ./output/

View File

@ -3,6 +3,7 @@
## See debhelper(7) (uncomment to enable). ## See debhelper(7) (uncomment to enable).
## Output every command that modifies files on the build system. ## Output every command that modifies files on the build system.
export DH_VERBOSE = 1 export DH_VERBOSE = 1
export PIKA_BUILD_ARCH = $(shell cat pika-build-arch)
override_dh_prep: override_dh_prep:
# amd64 build prep # amd64 build prep

10
pika-build-config/amd64-v3.sh Executable file
View File

@ -0,0 +1,10 @@
PIKA_BUILD_ARCH="amd64-v3"
DEBIAN_FRONTEND="noninteractive"
DEB_BUILD_MAINT_OPTIONS="optimize=+lto -march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
DEB_CFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
DEB_CPPFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
DEB_CXXFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
DEB_LDFLAGS_MAINT_APPEND="-march=x86-64-v3 -O3 -flto -fuse-linker-plugin -falign-functions=32"
DEB_BUILD_OPTIONS="nocheck notest terse"
DPKG_GENSYMBOLS_CHECK_LEVEL=0
DRIVER_ARCH="Linux-x86_64"

5
pika-build-config/i386.sh Executable file
View File

@ -0,0 +1,5 @@
PIKA_BUILD_ARCH="i386"
DEBIAN_FRONTEND="noninteractive"
DEB_BUILD_OPTIONS="nocheck notest terse"
DPKG_GENSYMBOLS_CHECK_LEVEL=0
DRIVER_ARCH="Linux-x86_64"