Use new repo name

This commit is contained in:
lleyton
2022-10-22 15:54:41 -07:00
committed by GitHub
parent 214ba870b5
commit 0725b04a35
6 changed files with 23 additions and 27 deletions
+1 -2
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/andaman-common-pkgs/subatomic-repos/raw/main/ad37.repo
sudo dnf config-manager --add-repo https://github.com/andaman-common-pkgs/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"
@@ -35,7 +35,6 @@ jobs:
- run: git fetch
#- run: git checkout HEAD^
# - name: Generate Build matrix
# id: generate_build_matrix
# # generate build matrix by checking out changes in anda/
+3 -4
View File
@@ -1,6 +1,5 @@
name: Bootstrap anda
on:
workflow_dispatch:
@@ -8,7 +7,7 @@ jobs:
bootstrap:
strategy:
matrix:
version: ["ad37"]
version: ["terra37"]
arch: ["x86_64", "aarch64"]
fail-fast: true
runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -31,7 +30,7 @@ jobs:
- name: Install repositories
run: |
sudo dnf install -y dnf-plugins-core
sudo dnf config-manager --add-repo https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/ad37.repo
sudo dnf config-manager --add-repo https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/terra37.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:
@@ -52,4 +51,4 @@ jobs:
subatomic-cli upload --prune \
--server https://subatomic.fyralabs.com \
--token ${{ secrets.SUBATOMIC_TOKEN }} \
${{ matrix.version }} anda-build/rpm/rpms/*
${{ matrix.version }} anda-build/rpm/rpms/*
+3 -6
View File
@@ -1,6 +1,5 @@
name: Bootstrap subatomic
on:
workflow_dispatch:
@@ -8,7 +7,7 @@ jobs:
bootstrap:
strategy:
matrix:
version: ["ad37"]
version: ["terra37"]
arch: ["x86_64", "aarch64"]
fail-fast: true
runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -16,13 +15,11 @@ jobs:
image: fedora:37
options: --cap-add=SYS_ADMIN --privileged
steps:
# - name: Run shell commands
# run: |
# git config --global url.https://github.com/.insteadOf git://github.com/
# git clone https://github.com/FyraLabs/anda.git
- uses: actions/setup-go@v3
with:
go-version: "^1.19"
@@ -30,7 +27,7 @@ jobs:
- name: Install repositories
run: |
sudo dnf install -y dnf-plugins-core
sudo dnf config-manager --add-repo https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/ad37.repo
sudo dnf config-manager --add-repo https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/terra37.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:
@@ -58,4 +55,4 @@ jobs:
subatomic-cli upload --prune \
--server https://subatomic.fyralabs.com \
--token ${{ secrets.SUBATOMIC_TOKEN }} \
${{ matrix.version }} anda-build/rpm/rpms/*
${{ matrix.version }} anda-build/rpm/rpms/*
+4 -4
View File
@@ -10,7 +10,7 @@ jobs:
parse:
outputs:
pkgs: ${{ steps.parsing.outputs.pkgs }}
runs-on: 'ubuntu-latest'
runs-on: "ubuntu-latest"
steps:
- name: Parse Input
id: parsing
@@ -20,7 +20,7 @@ jobs:
strategy:
matrix:
pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
version: ["ad37"]
version: ["terra37"]
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/andaman-common-pkgs/subatomic-repos/raw/main/ad37.repo
sudo dnf config-manager --add-repo https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/terra37.repo
sudo dnf install -y anda-mock-configs subatomic-cli anda mock rpm-build mock-scm
- uses: terrapkg/anda-build@main
@@ -39,7 +39,7 @@ jobs:
name: "${{ matrix.pkg }}pkg"
mockConfig: anda-37-${{ matrix.arch }}
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/andaman-common-pkgs/subatomic-repos/raw/main/ad37.repo
andaRepo: https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/terra37.repo
- name: Install Subatomic client
run: sudo dnf install -y subatomic-cli
+4 -4
View File
@@ -49,7 +49,7 @@ jobs:
strategy:
matrix:
pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
version: ["ad37"]
version: ["terra37"]
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/andaman-common-pkgs/subatomic-repos/raw/main/ad37.repo
sudo dnf config-manager --add-repo https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/terra37.repo
sudo dnf install -y anda-mock-configs subatomic-cli anda mock rpm-build
- uses: andaman-common-pkgs/anda-build@main
@@ -69,7 +69,7 @@ jobs:
with:
name: "anda/${{ matrix.pkg }}/pkg"
mockConfig: anda-37-${{ matrix.arch }}
andaRepo: https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/ad37.repo
andaRepo: https://github.com/andaman-common-pkgs/subatomic-repos/raw/main/terra37.repo
- name: Install Subatomic client
run: sudo dnf install -y subatomic-cli
@@ -80,4 +80,4 @@ jobs:
subatomic-cli upload --prune \
--server https://subatomic.fyralabs.com \
--token ${{ secrets.SUBATOMIC_TOKEN }} \
${{ matrix.version }} anda-build/rpm/rpms/*
${{ matrix.version }} anda-build/rpm/rpms/*