diff --git a/.forgejo/workflows/build-packages.yml b/.forgejo/workflows/build-packages.yml index a8e02b8..503fa20 100644 --- a/.forgejo/workflows/build-packages.yml +++ b/.forgejo/workflows/build-packages.yml @@ -5,6 +5,7 @@ on: branches: [ main, master ] pull_request: branches: [ main, master ] + workflow_dispatch: env: UBUNTU_VERSION: "24.04" @@ -15,20 +16,22 @@ env: jobs: build-libostree-backport: name: Build libostree Backport - runs-on: ubuntu-latest + runs-on: [linux, x64, docker:dind] + container: + image: ubuntu:latest steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup build environment run: | - sudo apt update - sudo apt install -y devscripts build-essential wget + apt update -y + apt install -y devscripts build-essential wget - name: Add source repositories run: | - echo "deb-src http://us.archive.ubuntu.com/ubuntu/ noble main universe" | sudo tee /etc/apt/sources.list.d/noble-sources.list - sudo apt update + echo "deb-src http://us.archive.ubuntu.com/ubuntu/ noble main universe" | tee /etc/apt/sources.list.d/noble-sources.list + apt update - name: Create backport directory run: | @@ -56,7 +59,7 @@ jobs: - name: Install build dependencies run: | cd /opt/Projects/ostree-backport-noble/ostree-${OSTREE_VERSION} - sudo apt build-dep ./ + apt build-dep ./ - name: Build libostree backport run: | @@ -64,7 +67,7 @@ jobs: dpkg-buildpackage -us -uc -b - name: Upload libostree artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: libostree-backport-packages path: /opt/Projects/ostree-backport-noble/*.deb @@ -72,27 +75,29 @@ jobs: build-bootc: name: Build bootc Package - runs-on: ubuntu-latest + runs-on: [linux, x64, docker:dind] + container: + image: ubuntu:latest needs: build-libostree-backport steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Download libostree artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: libostree-backport-packages path: /tmp/libostree-packages - name: Install libostree backport run: | - sudo dpkg -i /tmp/libostree-packages/*.deb || true - sudo apt --fix-broken install -y + dpkg -i /tmp/libostree-packages/*.deb || true + apt --fix-broken install -y - name: Setup build environment run: | - sudo apt update - sudo apt install -y git cargo rustc pkg-config build-essential + apt update -y + apt install -y git cargo rustc pkg-config build-essential - name: Clone bootc source run: | @@ -115,7 +120,7 @@ jobs: dpkg-buildpackage -us -uc -b - name: Upload bootc artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: bootc-packages path: bootc-${BOOTC_VERSION}/../*.deb @@ -123,11 +128,13 @@ jobs: create-artifacts: name: Create Combined Artifacts - runs-on: ubuntu-latest + runs-on: [linux, x64, docker:dind] + container: + image: ubuntu:latest needs: [build-libostree-backport, build-bootc] steps: - name: Download all artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: /tmp/artifacts @@ -138,7 +145,7 @@ jobs: cp /tmp/artifacts/bootc-packages/*.deb release-assets/ 2>/dev/null || true - name: Upload combined artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: release-assets path: release-assets/ diff --git a/.forgejo/workflows/test-build.yml b/.forgejo/workflows/test-build.yml index a1c1f36..7d85190 100644 --- a/.forgejo/workflows/test-build.yml +++ b/.forgejo/workflows/test-build.yml @@ -5,6 +5,7 @@ on: branches: [ main, master ] pull_request: branches: [ main, master ] + workflow_dispatch: env: BOOTC_VERSION: "1.5.1" @@ -12,15 +13,17 @@ env: jobs: test-bootc-build: name: Test bootc Build (with existing libostree) - runs-on: ubuntu-latest + runs-on: [linux, x64, docker:dind] + container: + image: ubuntu:latest steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup build environment run: | - sudo apt update - sudo apt install -y git cargo rustc pkg-config build-essential + apt update -y + apt install -y git cargo rustc pkg-config build-essential - name: Check libostree version run: | diff --git a/.forgejo/workflows/update-readme.yml b/.forgejo/workflows/update-readme.yml index d4e5352..7599e8a 100644 --- a/.forgejo/workflows/update-readme.yml +++ b/.forgejo/workflows/update-readme.yml @@ -9,16 +9,18 @@ on: jobs: update-readme: name: Update README with Artifact Links - runs-on: ubuntu-latest + runs-on: [linux, x64, docker:dind] + container: + image: ubuntu:latest if: ${{ github.event.workflow_run.conclusion == 'success' }} steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: token: ${{ secrets.GITHUB_TOKEN }} - name: Download artifacts from previous workflow - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: release-assets path: /tmp/artifacts