diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 04cacc3..4d557fe 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,7 +42,7 @@ jobs: git diff .SRCINFO publish: - name: Publish container image + name: Publish OCI image needs: pretest if: github.event_name != 'pull_request' runs-on: ubuntu-latest @@ -51,8 +51,15 @@ jobs: - name: Checkout uses: actions/checkout@v2.4.0 - - name: OCI meta - id: meta + - name: Log in to ghcr.io + uses: redhat-actions/podman-login@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: OCI metadata + id: metadata uses: docker/metadata-action@v3 with: images: ghcr.io/${{ github.repository }} @@ -64,29 +71,28 @@ jobs: type=semver,pattern={{major}} type=sha - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to GHCR - uses: docker/login-action@v1 + - name: Build image + id: build + uses: redhat-actions/buildah-build@v2 with: + tags: ${{ steps.metadata.outputs.tags }} + labels: ${{ steps.metadata.outputs.labels }} + containerfiles: | + ./Dockerfile + extra-args: | + --pull + + - name: Push to ghcr.io + uses: redhat-actions/push-to-registry@v2 + with: + image: ${{ steps.build.outputs.image }} + tags: ${{ steps.build.outputs.tags }} registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v2 - with: - context: . - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} + extra-args: | + --disable-content-trust test: - name: Test (with prebuilt Container Image) + name: Test (with prebuilt OCI Image) needs: publish runs-on: ubuntu-latest diff --git a/CHANGELOG.md b/CHANGELOG.md index d4af7e3..0d4f3c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Move repo from datakrama to hapakaien - `builder` user is added to sudoers directly instead of via the wheel group +- Replace Docker with Buildah in CI ### Fixed diff --git a/action.yml b/action.yml index 9944c22..e237787 100644 --- a/action.yml +++ b/action.yml @@ -1,7 +1,7 @@ # https://help.github.com/en/articles/metadata-syntax-for-github-actions name: "Arch Linux's package action" description: "GitHub Action to run Arch Linux's package tools" -author: 'datakrama' +author: 'hapakaien' branding: icon: 'package' color: 'blue' @@ -38,7 +38,7 @@ inputs: runs: using: 'docker' - image: 'docker://ghcr.io/datakrama/archlinux-package-action:1' + image: 'docker://ghcr.io/hapakaien/archlinux-package-action:1' args: - ${{ inputs.path }} - ${{ inputs.pkgver }}