From b7c19f8d4b8f95ed27c845dbc6fee1e791b8d1b5 Mon Sep 17 00:00:00 2001 From: Michael Taylor Date: Sat, 26 Oct 2024 13:56:33 -0400 Subject: [PATCH 1/2] ci: add docker staging build --- .github/workflows/build.yaml | 17 ++++++++++++----- package.json | 3 ++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e6fb7c3..26f76b9 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -66,8 +66,15 @@ jobs: - name: Build and Push Docker Images run: | - docker buildx build \ - --platform linux/amd64,linux/arm64 \ - -t ${{ vars.DOCKER_NAMESPACE }}/${{ env.PROJECT_NAME }}:${{ env.DOCKER_TAG }} \ - -t ${{ vars.DOCKER_NAMESPACE }}/${{ env.PROJECT_NAME }}:${{ env.TAGNAME }} \ - --push . + if [[ "${GITHUB_REF}" == refs/heads/testing ]]; then + docker buildx build \ + --platform linux/amd64,linux/arm64 \ + -t ${{ vars.DOCKER_NAMESPACE }}/${{ env.PROJECT_NAME }}:staging \ + --push . + else + docker buildx build \ + --platform linux/amd64,linux/arm64 \ + -t ${{ vars.DOCKER_NAMESPACE }}/${{ env.PROJECT_NAME }}:${{ env.DOCKER_TAG }} \ + -t ${{ vars.DOCKER_NAMESPACE }}/${{ env.PROJECT_NAME }}:${{ env.TAGNAME }} \ + --push . + fi diff --git a/package.json b/package.json index 6ec18d9..a2d03f7 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,8 @@ "start": "ts-node src/index.ts", "server": "ts-node src/server.ts", "test": "mocha -r ts-node/register tests.ts", - "prepare-release": "bash ./scripts/release.sh" + "prepare-release": "bash ./scripts/release.sh", + "docker:build:local": "docker build -t dig-content-server:local ." }, "author": "", "license": "ISC", From 007cd4f4a3cecca9266ffcb8f66582c42e8d2812 Mon Sep 17 00:00:00 2001 From: Michael Taylor Date: Sat, 26 Oct 2024 13:57:03 -0400 Subject: [PATCH 2/2] chore(release): 0.0.1-alpha.63 --- CHANGELOG.md | 2 ++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1356755..b7cd720 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [0.0.1-alpha.63](https://github.com/DIG-Network/dig-incentive-server/compare/v0.0.1-alpha.62...v0.0.1-alpha.63) (2024-10-26) + ### [0.0.1-alpha.62](https://github.com/DIG-Network/dig-incentive-server/compare/v0.0.1-alpha.61...v0.0.1-alpha.62) (2024-10-10) ### [0.0.1-alpha.61](https://github.com/DIG-Network/dig-incentive-server/compare/v0.0.1-alpha.60...v0.0.1-alpha.61) (2024-10-08) diff --git a/package-lock.json b/package-lock.json index 1d9a0da..fdb3a55 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "dig-incentive-server", - "version": "0.0.1-alpha.62", + "version": "0.0.1-alpha.63", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "dig-incentive-server", - "version": "0.0.1-alpha.62", + "version": "0.0.1-alpha.63", "license": "ISC", "dependencies": { "@dignetwork/dig-sdk": "^0.0.1-alpha.169", diff --git a/package.json b/package.json index a2d03f7..39a938d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dig-incentive-server", - "version": "0.0.1-alpha.62", + "version": "0.0.1-alpha.63", "description": "", "type": "commonjs", "main": "./dist/index.js",