fix main
This commit is contained in:
parent
f84535f74f
commit
e36800779d
5
.github/workflows/build-canaryv3.yml
vendored
5
.github/workflows/build-canaryv3.yml
vendored
@ -30,5 +30,8 @@ jobs:
|
||||
- name: Update APT Cache
|
||||
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
|
||||
run: ./mainv3.sh
|
||||
run: ./main.sh
|
||||
|
5
.github/workflows/build-nestv3.yml
vendored
5
.github/workflows/build-nestv3.yml
vendored
@ -30,5 +30,8 @@ jobs:
|
||||
- name: Update APT Cache
|
||||
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
|
||||
run: ./mainv3.sh
|
||||
run: ./main.sh
|
||||
|
5
.github/workflows/release-canaryv3.yml
vendored
5
.github/workflows/release-canaryv3.yml
vendored
@ -30,8 +30,11 @@ jobs:
|
||||
- name: Update APT Cache
|
||||
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
|
||||
run: ./mainv3.sh
|
||||
run: ./main.sh
|
||||
|
||||
- name: Release Package
|
||||
run: ./release.sh
|
||||
|
5
.github/workflows/release-nestv3.yml
vendored
5
.github/workflows/release-nestv3.yml
vendored
@ -30,8 +30,11 @@ jobs:
|
||||
- name: Update APT Cache
|
||||
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
|
||||
run: ./mainv3.sh
|
||||
run: ./main.sh
|
||||
|
||||
- name: Release Package
|
||||
run: ./release.sh
|
||||
|
@ -1,3 +0,0 @@
|
||||
[build]
|
||||
[target.x86_64-unknown-linux-gnu]
|
||||
rustflags = ["-Ctarget-cpu=x86-64-v3"]
|
7
debian/rules
vendored
7
debian/rules
vendored
@ -1,7 +1,14 @@
|
||||
#!/usr/bin/make -f
|
||||
|
||||
export PIKA_BUILD_ARCH = $(shell cat pika-build-arch)
|
||||
export PATH := $(PATH):/root/.cargo/bin
|
||||
|
||||
override_dh_prep:
|
||||
# amd64 build prep
|
||||
ifeq (amd64-v3,$(PIKA_BUILD_ARCH))
|
||||
export RUSTFLAGS = "-C target-cpu=x86-64-v3"
|
||||
endif
|
||||
|
||||
%:
|
||||
dh ${@}
|
||||
|
||||
|
28
main.sh
Executable file
28
main.sh
Executable file
@ -0,0 +1,28 @@
|
||||
#! /bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
VERSION="1.0.0"
|
||||
|
||||
source ./pika-build-config.sh
|
||||
|
||||
echo "$PIKA_BUILD_ARCH" > pika-build-arch
|
||||
|
||||
# Clone Upstream
|
||||
mkdir -p pika-drivers
|
||||
cp -rvf ./* ./pika-drivers/ || true
|
||||
cd ./pika-drivers/
|
||||
|
||||
# Get build deps
|
||||
apt-get build-dep ./ -y
|
||||
apt-get install curl -y
|
||||
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | CARGO_HOME=/root/.cargo sh -s -- -y
|
||||
|
||||
# Build package
|
||||
LOGNAME=root dh_make --createorig -y -l -p pika-drivers_"$VERSION" || echo "dh-make: Ignoring Last Error"
|
||||
dpkg-buildpackage --no-sign
|
||||
|
||||
# Move the debs to output
|
||||
cd ../
|
||||
mkdir -p ./output
|
||||
mv ./*.deb ./output/
|
35
mainv3.sh
35
mainv3.sh
@ -1,35 +0,0 @@
|
||||
#! /bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
VERSION="1.0.0"
|
||||
|
||||
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
|
||||
|
||||
# Clone Upstream
|
||||
mkdir -p pika-drivers
|
||||
cp -rvf ./* ./pika-drivers/ || true
|
||||
mkdir ./pika-drivers/.cargo
|
||||
cp -vf ./cargo-config-v3.toml ./pika-drivers/.cargo/config.toml
|
||||
cd ./pika-drivers/
|
||||
|
||||
# Get build deps
|
||||
apt-get build-dep ./ -y
|
||||
apt-get install curl -y
|
||||
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | CARGO_HOME=/root/.cargo sh -s -- -y
|
||||
|
||||
# Build package
|
||||
LOGNAME=root dh_make --createorig -y -l -p pika-drivers_"$VERSION" || echo "dh-make: Ignoring Last Error"
|
||||
dpkg-buildpackage --no-sign
|
||||
|
||||
# Move the debs to output
|
||||
cd ../
|
||||
mkdir -p ./output
|
||||
mv ./*.deb ./output/
|
9
pika-build-config/amd64-v3.sh
Executable file
9
pika-build-config/amd64-v3.sh
Executable file
@ -0,0 +1,9 @@
|
||||
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
|
Loading…
Reference in New Issue
Block a user