Skip to content

Commit

Permalink
fix/ci: update workflow to push to main only on tags
Browse files Browse the repository at this point in the history
Signed-off-by: K.B.Dharun Krishna <[email protected]>
  • Loading branch information
kbdharun committed Sep 17, 2024
1 parent c3be4c6 commit 87915a4
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 4 deletions.
41 changes: 38 additions & 3 deletions .github/workflows/vib-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Vib Build
on:
push:
branches:
- 'main'
- 'dev'
tags:
- '*'
workflow_dispatch:
Expand All @@ -18,14 +18,34 @@ jobs:

steps:
- name: Verify Base Image Integrity
if: ${{ github.ref_type == 'tag' }}
run:
gh attestation verify oci://ghcr.io/vanilla-os/desktop:main --owner Vanilla-OS
env:
GH_TOKEN: ${{ github.token }}

check_base_status:
runs-on: ubuntu-latest
steps:
- name: Clone base image
if: ${{ github.ref_type == 'tag' }}
uses: actions/checkout@v4
with:
repository: Vanilla-OS/desktop-image

- name: Check if base is up to date
if: ${{ github.ref_type == 'tag' }}
run: |
git fetch origin
main_head=$( git rev-parse origin/main )
dev_head=$( git rev-parse origin/dev )
echo main branch is at: $main_head
echo dev branch is at: $dev_head
[ "$main_head" = "$dev_head" ]
build:
runs-on: ubuntu-latest
needs: verify-image
needs: [verify-image, check_base_status]
permissions:
contents: write # Allow actions to create release
packages: write # Allow pushing images to GHCR
Expand All @@ -35,6 +55,11 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Change tag in recipe
if: ${{ github.ref_type == 'tag' }}
run: |
sed 's/ghcr.io\/vanilla-os\/desktop:dev/ghcr.io\/vanilla-os\/desktop:main/' -i recipe.yml
- uses: vanilla-os/[email protected]
with:
recipe: 'recipe.yml'
Expand All @@ -51,6 +76,16 @@ jobs:
echo "REPO_OWNER_LOWERCASE=$REPO_OWNER_LOWERCASE" >> "$GITHUB_ENV"
echo "IMAGE_URL=ghcr.io/$REPO_OWNER_LOWERCASE/vm" >> "$GITHUB_ENV"
- name: Extra image tag branch
if: ${{ github.ref_type != 'tag' }}
run: |
echo "EXTRA_TAG=ref,event=branch" >> "$GITHUB_ENV"
- name: Extra image tag release
if: ${{ github.ref_type == 'tag' }}
run: |
echo "EXTRA_TAG=raw,main" >> "$GITHUB_ENV"
- name: Docker meta
id: docker_meta
uses: docker/metadata-action@v5
Expand All @@ -62,7 +97,7 @@ jobs:
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{raw}}
type=semver,pattern=v{{major}}
type=ref,event=branch
type=${{ env.EXTRA_TAG }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
Expand Down
2 changes: 1 addition & 1 deletion recipe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Vanilla Desktop VM
id: vm
stages:
- id: build
base: ghcr.io/vanilla-os/desktop:main
base: ghcr.io/vanilla-os/desktop:dev
singlelayer: false
labels:
maintainer: Vanilla OS Contributors
Expand Down

0 comments on commit 87915a4

Please sign in to comment.