Skip to content

Commit

Permalink
Merge pull request #4 from wuvt/chore/ghmq
Browse files Browse the repository at this point in the history
chore: migrate to github merge queue
  • Loading branch information
jbellerb authored Mar 4, 2024
2 parents 5504d0a + 53d7f59 commit c600d8b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
23 changes: 12 additions & 11 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ name: Create and publish a Docker image

on:
push:
branches: [master, staging, trying]
branches: [master]
pull_request:
branches: [master]
merge_group:

permissions:
contents: read
Expand All @@ -16,13 +17,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Nix
uses: cachix/install-nix-action@v18
uses: cachix/install-nix-action@v25

- name: Setup Cachix
uses: cachix/cachix-action@v12
uses: cachix/cachix-action@v14
with:
name: wuvt
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
Expand All @@ -36,13 +37,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Nix
uses: cachix/install-nix-action@v18
uses: cachix/install-nix-action@v25

- name: Setup Cachix
uses: cachix/cachix-action@v12
uses: cachix/cachix-action@v14
with:
name: wuvt
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
Expand All @@ -51,25 +52,25 @@ jobs:
run: nix build .#poser-container

- name: Upload the built Docker image
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: docker
path: result

push-image:
name: Publish the Docker image to GitHub
if: github.ref != 'refs/heads/staging' && github.ref != 'refs/heads/trying'
if: github.event_name != 'merge_group'
needs: build-image
runs-on: ubuntu-latest
steps:
- name: Download the build Docker image
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: docker

- name: Generate tags
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v5
with:
images: ghcr.io/wuvt/poser
sep-tags: " "
Expand Down
1 change: 0 additions & 1 deletion bors.toml

This file was deleted.

0 comments on commit c600d8b

Please sign in to comment.