funkemunky/packages
1
0
Fork 0
mirror of https://github.com/terrapkg/packages.git synced 2026-06-02 18:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(ci): add mock label to ci, also remove multilib (#2863)

Browse Source 
* feat(ci): add mock label to ci, also remove multilib

* feat: switch packages to use `arches = [...]`

* ???

Signed-off-by: madomado <madonuko@outlook.com>

* feat: add mock labels to pkgs

* feat: add condition for setup scripts and dnf builddep

---------

Signed-off-by: madomado <madonuko@outlook.com>
This commit is contained in:
madomado
2025-01-03 17:04:45 +08:00
committed by GitHub
parent e0bf8d9dd6
commit 5ea63f4910
10 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/autobuild.yml
+3 -5
View File
@@ -56,6 +56,7 @@ jobs:
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: CI Setup Script
if: !matrix.pkg.labels ["mock"]
run: |
dir=$(dirname ${{ matrix.pkg.pkg }})
if [ -f $dir/ci_setup.rhai ]; then
@@ -63,16 +64,13 @@ jobs:
fi
- name: Install Build Dependencies
if: !matrix.pkg.labels ["mock"]
run: |
dir=$(dirname ${{ matrix.pkg.pkg }})
dnf5 builddep -y ${dir}/*.spec
- name: Build with Andaman
run: anda build ${{ matrix.pkg.pkg }} -rrpmbuild
- name: Build with Andaman (alternate arch)
if: matrix.pkg.arch == 'x86_64' && matrix.pkg.labels['multilib']
run: anda build ${{ matrix.pkg.pkg }} --package rpm -c terra-${{ matrix.version }}-i386
run: anda build ${{ matrix.pkg.pkg }} ${{ matrix.pkg.labels['mock'] && '-c terra-${{ matrix.version }}-${{ matrix.pkg.arch }}' || '-rrpmbuild' }}
- name: Generating artifact name
id: art
.github/workflows/json-build.yml
+3 -1
View File
@@ -27,6 +27,7 @@ jobs:
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: CI Setup Script
if: !matrix.pkg.labels ["mock"]
run: |
dir=$(dirname ${{ matrix.pkg.pkg }})
if [ -f $dir/ci_setup.rhai ]; then
@@ -34,12 +35,13 @@ jobs:
fi
- name: Install Build Dependencies
if: !matrix.pkg.labels ["mock"]
run: |
dir=$(dirname ${{ matrix.pkg.pkg }})
dnf5 builddep -y ${dir}/*.spec
- name: Build with Andaman
run: anda build ${{ matrix.pkg.pkg }} -rrpmbuild
run: anda build ${{ matrix.pkg.pkg }} ${{ matrix.pkg.labels['mock'] && '-c terra-${{ matrix.version }}-${{ matrix.pkg.arch }}' || '-rrpmbuild' }}
- name: Generating artifact name
id: art
anda/fusion/kmod-v4l2loopback/anda.hcl
+3
View File
@@ -2,4 +2,7 @@ project pkg {
rpm {
spec = "kmod-v4l2loopback.spec"
}
labels {
mock = 1
}
}
anda/games/gamescope-legacy/anda.hcl
+1 -3
View File
@@ -1,8 +1,6 @@
project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "gamescope-legacy.spec"
}
labels {
multilib = 1
}
}
anda/games/gamescope/anda.hcl
+1 -1
View File
@@ -1,9 +1,9 @@
project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "gamescope.spec"
}
labels {
multilib = 1
extra = 1
}
}
anda/lib/mesa/anda.hcl
+1 -1
View File
@@ -1,9 +1,9 @@
project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "mesa.spec"
}
labels {
multilib = 1
extra = 1
}
}
anda/misc/extest/anda.hcl
+1 -3
View File
@@ -1,8 +1,6 @@
project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "rust-extest.spec"
}
labels {
multilib = 1
}
}
anda/system/mesa-freeworld/anda.hcl
+1 -1
View File
@@ -1,9 +1,9 @@
project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "mesa-freeworld.spec"
}
labels {
updbranch = 1
multilib = 1
}
}
anda/system/xpadneo/anda.hcl
+3
View File
@@ -2,4 +2,7 @@ project pkg {
rpm {
spec = "xpadneo.spec"
}
labels {
mock = 1
}
}
anda/system/zenpower3/anda.hcl
+3
View File
@@ -2,4 +2,7 @@ project pkg {
rpm {
spec = "zenpower3.spec"
}
labels {
mock = 1
}
}