funkemunky/packages
1
0
Fork 0
mirror of https://github.com/terrapkg/packages.git synced 2026-05-31 00:51:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: fix rawhide action files (#1035)

Browse Source 
* ci: fix rawhide action files

* fix: readd frawhide in update-comps
This commit is contained in:
lea
2024-04-01 23:41:10 -07:00
committed by GitHub
parent 96bfec2357
commit be6b42e2d2
8 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/autobuild.yml
+6 -5
View File
@@ -29,7 +29,7 @@ jobs:
- name: Set workspace as safe
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Generate build matrix
@@ -40,7 +40,7 @@ jobs:
strategy:
matrix:
pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
version: ["rawhide"]
version: ["39"]
fail-fast: false
runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
container:
@@ -48,7 +48,7 @@ jobs:
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up git repository
@@ -56,7 +56,7 @@ jobs:
- name: Cache buildroot
id: br-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /var/cache
key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}
@@ -75,9 +75,10 @@ jobs:
x=${NAME//\//@}
echo "name=$x" >> $GITHUB_OUTPUT
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ${{ steps.art.outputs.name }}
compression-level: 0 # The RPMs are already compressed :p
path: |
anda-build/rpm/rpms/*
anda-build/rpm/srpm/*
.github/workflows/bootstrap.yml
+1 -1
View File
@@ -21,7 +21,7 @@ jobs:
- name: Install Anda
run: cargo install anda
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: f${{ matrix.version }}
fetch-depth: 1
.github/workflows/build.yml
+4 -3
View File
@@ -30,7 +30,7 @@ jobs:
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up git repository
@@ -38,7 +38,7 @@ jobs:
- name: Cache buildroot
id: br-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /var/cache
key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.arch }}-${{ matrix.pkg }}
@@ -53,9 +53,10 @@ jobs:
x=${NAME//\//@}
echo "name=$x" >> $GITHUB_OUTPUT
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ${{ steps.art.outputs.name }}
compression-level: 0 # The RPMs are already compressed :p
path: |
anda-build/rpm/rpms/*
anda-build/rpm/srpm/*
.github/workflows/json-build.yml
+4 -3
View File
@@ -19,7 +19,7 @@ jobs:
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up git repository
@@ -27,7 +27,7 @@ jobs:
- name: Cache buildroot
id: br-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /var/cache
key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
@@ -42,9 +42,10 @@ jobs:
x=${NAME//\//@}
echo "name=$x" >> $GITHUB_OUTPUT
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ${{ steps.art.outputs.name }}
compression-level: 0 # The RPMs are already compressed :p
path: |
anda-build/rpm/rpms/*
anda-build/rpm/srpm/*
.github/workflows/lint.yml
+1 -1
View File
@@ -17,6 +17,6 @@ jobs:
image: ghcr.io/terrapkg/builder:frawhide
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Lint spec files
run: rpmlint $(find anda -type f -name "*.spec" -type f)
.github/workflows/update-comps.yml
+1 -1
View File
@@ -17,7 +17,7 @@ jobs:
container:
image: ghcr.io/terrapkg/builder:frawhide
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Push to subatomic
run: |
branch=${{ github.ref_name }}
.github/workflows/update-nightly.yml
+8 -5
View File
@@ -8,11 +8,11 @@ jobs:
autoupdate:
runs-on: ubuntu-latest
container:
image: ghcr.io/terrapkg/builder:f38
image: ghcr.io/terrapkg/builder:frawhide
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
@@ -38,13 +38,16 @@ jobs:
git config user.signingkey "${{ runner.temp }}/signing_key"
msg="bump(nightly): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
git commit -S -a -m "$msg"
f37 () {
copy_over () {
git format-patch HEAD^
git checkout f37
git checkout $1
git apply *.patch || true
rm *.patch
git add *
git commit -S -a -m "$msg"
}
f37 || true
copy_over f38 || true
copy_over f39 || true
copy_over f40 || true
git push -u origin --all
fi
.github/workflows/update.yml
+4 -3
View File
@@ -8,11 +8,11 @@ jobs:
autoupdate:
runs-on: ubuntu-latest
container:
image: ghcr.io/terrapkg/builder:f39
image: ghcr.io/terrapkg/builder:frawhide
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
@@ -47,7 +47,8 @@ jobs:
git add *
git commit -S -a -m "$msg"
}
copy_over f37 || true
copy_over f38 || true
copy_over f39 || true
copy_over f40 || true
git push -u origin --all
fi