Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: migrate to github merge queues #17

Merged
merged 1 commit into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ name: Create and publish a Docker image

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

permissions:
contents: read
Expand All @@ -17,13 +18,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 @@ -37,13 +38,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 @@ -52,25 +53,25 @@ jobs:
run: nix build .#stackman-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/stackman
sep-tags: " "
Expand Down
1 change: 0 additions & 1 deletion bors.toml

This file was deleted.