Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 6 commits into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .github/workflows/autobuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,23 +56,21 @@ 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
anda run $dir/ci_setup.rhai --labels script_path=$dir/ci_setup.rhai
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
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/json-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,21 @@ 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
anda run $dir/ci_setup.rhai --labels script_path=$dir/ci_setup.rhai
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
Expand Down
3 changes: 3 additions & 0 deletions anda/fusion/kmod-v4l2loopback/anda.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@ project pkg {
rpm {
spec = "kmod-v4l2loopback.spec"
}
labels {
mock = 1
}
}
4 changes: 1 addition & 3 deletions anda/games/gamescope-legacy/anda.hcl
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "gamescope-legacy.spec"
}
labels {
multilib = 1
}
}
2 changes: 1 addition & 1 deletion anda/games/gamescope/anda.hcl
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "gamescope.spec"
}
labels {
multilib = 1
extra = 1
}
}
2 changes: 1 addition & 1 deletion anda/lib/mesa/anda.hcl
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "mesa.spec"
}
labels {
multilib = 1
extra = 1
}
}
4 changes: 1 addition & 3 deletions anda/misc/extest/anda.hcl
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "rust-extest.spec"
}
labels {
multilib = 1
}
}
2 changes: 1 addition & 1 deletion anda/system/mesa-freeworld/anda.hcl
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "mesa-freeworld.spec"
}
labels {
updbranch = 1
multilib = 1
}
}
3 changes: 3 additions & 0 deletions anda/system/xpadneo/anda.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@ project pkg {
rpm {
spec = "xpadneo.spec"
}
labels {
mock = 1
}
}
3 changes: 3 additions & 0 deletions anda/system/zenpower3/anda.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@ project pkg {
rpm {
spec = "zenpower3.spec"
}
labels {
mock = 1
}
}
Loading