From 9b079d1bac0fc29782e5a3eb6a5509ae4dca6e85 Mon Sep 17 00:00:00 2001 From: HubbeKing Date: Fri, 8 Nov 2024 20:02:57 +0200 Subject: [PATCH] Go back to the intended use so we can debug with act --- .github/workflows/main.yml | 26 ++++++-------------------- build | 1 - 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4335483..a241179 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,9 +20,6 @@ permissions: jobs: build: runs-on: ubuntu-24.04 - # run jobs in buildah containers, since ubuntu is bad at keeping packages updated - container: - image: quay.io/buildah/stable:latest strategy: fail-fast: false matrix: @@ -43,15 +40,8 @@ jobs: - thrimshim - zulip_bots steps: - - name: Install git - # the buildah/stable image doesn't include git - # actions/checkout works without git, but not if you do submodules - # thus, we install git - run: | - sudo dnf install -y git - - name: Check out repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: recursive # By default, for PR builds, Actions will check out a merge commit between the actual @@ -63,20 +53,16 @@ jobs: - name: Install QEMU # qemu-user-static is used by buildah to do multiplatform builds - # the buildah image is fedora-based, hence we use dnf run: | - sudo dnf install -y qemu-user-static + sudo apt update + sudo apt install -y qemu-user-static - - name: Create containers/auth.json file - env: + - name: Log in to ghcr.io + uses: docker/login-action@v3 + with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - run: | - mkdir -p ~/.config/containers - echo "$username:$password" | base64 > tmp - echo "{"auths":{"ghcr.io":{"auth": $(cat tmp)}}}" > ~/.config/containers/auth.json - rm tmp - name: Build ${{ matrix.component }} # always push diff --git a/build b/build index 581908e..c17aa9c 100755 --- a/build +++ b/build @@ -104,7 +104,6 @@ for component in "${COMPONENTS[@]}"; do -f "$component/Dockerfile" \ -t "$latest" \ -t "$specific" \ - --manifest "wubloader-$component" \ "${CACHE_ARGS[@]}" \ . fi