Fix workflowsz

This commit is contained in:
lleyton
2022-10-22 16:08:57 -07:00
committed by GitHub
parent e724df659a
commit efa60ba969
5 changed files with 13 additions and 13 deletions
+1 -1
View File
@@ -24,7 +24,7 @@ jobs:
- 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/terra.repo
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"
+3 -3
View File
@@ -7,7 +7,7 @@ jobs:
bootstrap:
strategy:
matrix:
version: ["terra37"]
version: ["37"]
arch: ["x86_64", "aarch64"]
fail-fast: true
runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -30,7 +30,7 @@ jobs:
- 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.repo
sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
- run: sudo dnf install -y mock createrepo_c rpm-build anda-mock-configs gcc curl wget git-core openssl-devel
- uses: actions-rs/toolchain@v1
with:
@@ -51,4 +51,4 @@ jobs:
subatomic-cli upload --prune \
--server https://subatomic.fyralabs.com \
--token ${{ secrets.SUBATOMIC_TOKEN }} \
${{ matrix.version }} anda-build/rpm/rpms/*
terra${{ matrix.version }} anda-build/rpm/rpms/*
+3 -3
View File
@@ -7,7 +7,7 @@ jobs:
bootstrap:
strategy:
matrix:
version: ["terra37"]
version: ["37"]
arch: ["x86_64", "aarch64"]
fail-fast: true
runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -27,7 +27,7 @@ jobs:
- 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.repo
sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
- run: sudo dnf install -y mock createrepo_c rpm-build anda-mock-configs gcc curl wget git-core openssl-devel
- uses: actions/checkout@v3
with:
@@ -55,4 +55,4 @@ jobs:
subatomic-cli upload --prune \
--server https://subatomic.fyralabs.com \
--token ${{ secrets.SUBATOMIC_TOKEN }} \
${{ matrix.version }} anda-build/rpm/rpms/*
terra${{ matrix.version }} anda-build/rpm/rpms/*
+3 -3
View File
@@ -20,7 +20,7 @@ jobs:
strategy:
matrix:
pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
version: ["terra37"]
version: ["37"]
arch: ["x86_64", "aarch64"]
fail-fast: false
runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -31,7 +31,7 @@ jobs:
- 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.repo
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
@@ -49,4 +49,4 @@ jobs:
subatomic-cli upload --prune \
--server https://subatomic.fyralabs.com \
--token ${{ secrets.SUBATOMIC_TOKEN }} \
${{ matrix.version }} anda-build/rpm/rpms/*
terra${{ matrix.version }} anda-build/rpm/rpms/*
+3 -3
View File
@@ -49,7 +49,7 @@ jobs:
strategy:
matrix:
pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
version: ["terra37"]
version: ["37"]
arch: ["x86_64", "aarch64"]
fail-fast: false
#if: ${{ matrix.changed_folders != '' }}
@@ -61,7 +61,7 @@ jobs:
- 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.repo
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: andaman-common-pkgs/anda-build@main
@@ -80,4 +80,4 @@ jobs:
subatomic-cli upload --prune \
--server https://subatomic.fyralabs.com \
--token ${{ secrets.SUBATOMIC_TOKEN }} \
${{ matrix.version }} anda-build/rpm/rpms/*
terra${{ matrix.version }} anda-build/rpm/rpms/*