From 6d3d9c1d83caa609be06cf77f0b47722a5aad1e2 Mon Sep 17 00:00:00 2001 From: Brad Macdonald Date: Mon, 9 Oct 2023 15:35:02 -0600 Subject: [PATCH 1/5] updates CI --- .github/workflows/dev.yml | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index b53dc18b..d3ccbf88 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -4,7 +4,8 @@ name: CI on: push: - branches: ["dev"] + branches: ["dev", "bwmac/IBCDPE-386/ghcr_ci"] + tags: ['v[0-9]*', '[0-9]+.[0-9]+*'] # Match tags that resemble a version pull_request: # Allows you to run this workflow manually from the Actions tab @@ -56,3 +57,36 @@ jobs: - run: pip install -U setuptools - run: pip install . - run: adt test_config.yaml -t ${{secrets.SYNAPSE_PAT}} + + docker-publish: + needs: [build, test] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Login to GitHub Container Registry + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - id: meta + uses: docker/metadata-action@v4 + with: + images: | + ghcr.io/${{ github.repository }} + tags: | + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} + type=ref,event=branch + type=sha + latest + - name: Publish Docker Image + uses: docker/build-push-action@v3 + with: + context: . + build-args: | + TARBALL_PATH=${{ needs.prepare.outputs.tarball-path }} + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} From 86d9e380a4ec2afcb17c08ebdbd9f80dc569ecbe Mon Sep 17 00:00:00 2001 From: Brad Macdonald Date: Tue, 10 Oct 2023 11:04:38 -0600 Subject: [PATCH 2/5] change step name --- .github/workflows/dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index d3ccbf88..02719747 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -58,7 +58,7 @@ jobs: - run: pip install . - run: adt test_config.yaml -t ${{secrets.SYNAPSE_PAT}} - docker-publish: + ghcr-publish: needs: [build, test] runs-on: ubuntu-latest steps: From 72c77fb0f2396c916e4391e72e32e4eddafba673 Mon Sep 17 00:00:00 2001 From: Brad Macdonald Date: Tue, 10 Oct 2023 12:11:06 -0600 Subject: [PATCH 3/5] remove feature branch --- .github/workflows/dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 02719747..aa50ac4c 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -4,7 +4,7 @@ name: CI on: push: - branches: ["dev", "bwmac/IBCDPE-386/ghcr_ci"] + branches: ["dev"] tags: ['v[0-9]*', '[0-9]+.[0-9]+*'] # Match tags that resemble a version pull_request: From 4c3317fe1e0f1532b6710520fc2bd07752addacf Mon Sep 17 00:00:00 2001 From: Brad Macdonald Date: Tue, 10 Oct 2023 13:10:54 -0600 Subject: [PATCH 4/5] move comment --- .github/workflows/dev.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index aa50ac4c..8e216afa 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -5,7 +5,8 @@ name: CI on: push: branches: ["dev"] - tags: ['v[0-9]*', '[0-9]+.[0-9]+*'] # Match tags that resemble a version + # Match tags that resemble a version + tags: ['v[0-9]*', '[0-9]+.[0-9]+*'] pull_request: # Allows you to run this workflow manually from the Actions tab From 3ac5396f72c40ad54d9182710420f39ffafd5642 Mon Sep 17 00:00:00 2001 From: Brad Macdonald Date: Tue, 10 Oct 2023 14:50:02 -0600 Subject: [PATCH 5/5] updates tags regex --- .github/workflows/dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 8e216afa..1bc802c6 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -6,7 +6,7 @@ on: push: branches: ["dev"] # Match tags that resemble a version - tags: ['v[0-9]*', '[0-9]+.[0-9]+*'] + tags: ['[0-9]+\.[0-9]+\.[0-9]+'] pull_request: # Allows you to run this workflow manually from the Actions tab