Use terrapkg/builder image (#124)

This commit is contained in:
lleyton
2023-01-14 22:33:26 +00:00
committed by GitHub
parent ba3482bdc1
commit 5507bf9ff2
6 changed files with 7 additions and 57 deletions
+2 -18
View File
@@ -17,17 +17,10 @@ jobs:
outputs:
build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
container:
image: registry.fedoraproject.org/fedora:37
image: ghcr.io/terrapkg/builder:nightly
options: --cap-add=SYS_ADMIN --privileged
# check out the repo
steps:
- name: Set up dependencies
run: |
sudo dnf install -y dnf-plugins-core
sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra37.repo
sudo dnf install -y anda mock rpm-build git-core
# add to safe directory
git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Checkout
uses: actions/checkout@v3
with:
@@ -68,15 +61,9 @@ jobs:
#if: ${{ matrix.changed_folders != '' }}
runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
container:
image: registry.fedoraproject.org/fedora:37
image: ghcr.io/terrapkg/builder:nightly
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Install repositories
run: |
sudo dnf install -y dnf-plugins-core
sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
sudo dnf install -y anda-mock-configs subatomic-cli anda mock rpm-build mock-scm
- uses: terrapkg/anda-build@main
with:
name: "${{ matrix.pkg.pkg }}"
@@ -84,9 +71,6 @@ jobs:
extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"
andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
- name: Install Subatomic client
run: sudo dnf install -y subatomic-cli
- name: Upload packages to subatomic
run: |
subatomic-cli upload --prune \
+1 -10
View File
@@ -25,15 +25,9 @@ jobs:
fail-fast: false
runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
container:
image: registry.fedoraproject.org/fedora:37
image: ghcr.io/terrapkg/builder:nightly
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Install repositories
run: |
sudo dnf install -y dnf-plugins-core
sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
sudo dnf install -y anda-mock-configs subatomic-cli anda mock rpm-build mock-scm
- uses: terrapkg/anda-build@main
with:
name: "${{ matrix.pkg }}pkg"
@@ -41,9 +35,6 @@ jobs:
extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"
andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
- name: Install Subatomic client
run: sudo dnf install -y subatomic-cli
- name: Upload packages to subatomic
run: |
subatomic-cli upload --prune \
+1 -3
View File
@@ -6,11 +6,9 @@ jobs:
lint:
runs-on: ubuntu-latest
container:
image: registry.fedoraproject.org/fedora:37
image: ghcr.io/terrapkg/builder:nightly
steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Install dependencies
run: dnf install -y rpmlint
- name: Lint spec files
run: rpmlint $(find anda -type f -name "*.spec" -type f)
+1 -11
View File
@@ -40,7 +40,7 @@ jobs:
#if: ${{ matrix.changed_folders != '' }}
runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
container:
image: registry.fedoraproject.org/fedora:37
image: ghcr.io/terrapkg/builder:nightly
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Checkout
@@ -55,12 +55,6 @@ jobs:
else
echo "EXISTS=false" >> $GITHUB_OUTPUT
fi
- name: Install repositories
if: steps.check_files.outputs.EXISTS == 'true'
run: |
sudo dnf install -y dnf-plugins-core
sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
sudo dnf install -y anda-mock-configs subatomic-cli anda mock rpm-build
- uses: terrapkg/anda-build@main
if: steps.check_files.outputs.EXISTS == 'true'
@@ -70,10 +64,6 @@ jobs:
extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"
andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
- name: Install Subatomic client
if: steps.check_files.outputs.EXISTS == 'true'
run: sudo dnf install -y subatomic-cli
- name: Upload packages to subatomic
if: steps.check_files.outputs.EXISTS == 'true'
run: |
+1 -8
View File
@@ -12,16 +12,9 @@ jobs:
update-comps:
runs-on: ubuntu-latest
container:
image: fedora:37
image: ghcr.io/terrapkg/builder:nightly
steps:
- uses: actions/checkout@v3
- name: Install repositories
run: |
sudo dnf install -y dnf-plugins-core
sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra37.repo
- name: Install dependencies
run: |
sudo dnf install -y subatomic-cli
- name: Push to subatomic
run: |
subatomic-cli upload-comps \
+1 -7
View File
@@ -11,15 +11,9 @@ jobs:
autoupdate:
runs-on: ubuntu-latest
container:
image: registry.fedoraproject.org/fedora:37
image: ghcr.io/terrapkg/builder:nightly
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Install packages
run: |
sudo dnf install -y dnf-plugins-core
sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra37.repo
dnf install -y rpmdevtools git python anda
- name: Checkout
uses: actions/checkout@v3
with: