From 59a70a087929eb178addd26265e3270e17088f34 Mon Sep 17 00:00:00 2001 From: joe miller Date: Tue, 18 Jul 2023 16:22:18 -0700 Subject: [PATCH 1/4] docker: switch to planetscale wolfi images --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e5ebd31..e7a8e88 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,5 @@ # syntax=docker/dockerfile:1.4 -# cgr.dev/chainguard/git:2.41.0: -FROM cgr.dev/chainguard/git@sha256:549b8c78695131d41018e12e1c21107322227fd0669126f4bf13d00bf64cac6c +FROM us-docker.pkg.dev/planetscale-registry/wolfi-prod/git:2.41.0 COPY ghcommit /ghcommit From caa8cd7ac91d1b8287657b1650d496f31b8ca378 Mon Sep 17 00:00:00 2001 From: joe miller Date: Tue, 18 Jul 2023 16:36:40 -0700 Subject: [PATCH 2/4] ci/gha: try new triggers to run ci workflow on branches --- .github/workflows/ci.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 204a670..57cf70e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,7 +3,12 @@ name: ci on: push: branches: - - "*" + - main + pull_request: + types: + - opened + - reopened + - synchronize permissions: # these perms needed for goreleaser to publish releases and docker images (https://goreleaser.com/ci/actions/#token-permissions): @@ -13,7 +18,6 @@ permissions: jobs: test: runs-on: ubuntu-latest - if: github.event_name == 'push' && !contains(toJson(github.event.commits), '[ci skip]') && !contains(toJson(github.event.commits), '[skip ci]') steps: - uses: actions/checkout@v3 From 5046a166298e25ab1ed9128eb6d4eb2fb80ed013 Mon Sep 17 00:00:00 2001 From: joe miller Date: Wed, 19 Jul 2023 06:58:32 -0700 Subject: [PATCH 3/4] ci/gha: run make snapshot to non-main branch tests --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 57cf70e..cdb4920 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -37,6 +37,7 @@ jobs: - run: make lint - run: make test + - run: make snapshot release: needs: [test] From a6c97270ba15e299b0205959000c486ff2d61cb4 Mon Sep 17 00:00:00 2001 From: joe miller Date: Wed, 26 Jul 2023 09:03:08 -0700 Subject: [PATCH 4/4] docker: switch to planetscale wolfi-public images --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e7a8e88..14ac5a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.4 -FROM us-docker.pkg.dev/planetscale-registry/wolfi-prod/git:2.41.0 +FROM us-docker.pkg.dev/planetscale-registry/wolfi-public/git:2.41.0 COPY ghcommit /ghcommit