From 439e7e05e7593f35735e612332bda790536d9cbc Mon Sep 17 00:00:00 2001 From: Michael Taylor Date: Mon, 9 Sep 2024 10:12:08 -0400 Subject: [PATCH 1/2] ci: build.yaml --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7bce4f9..d66e459 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -48,7 +48,7 @@ jobs: echo "DOCKER_TAG=latest-alpha" >> $GITHUB_ENV else echo "DOCKER_TAG=latest" >> $GITHUB_ENV - fi # Add this line to close the 'if' statement + fi - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 From 478a878332df17facb21e17f1c9504767b726596 Mon Sep 17 00:00:00 2001 From: Michael Taylor Date: Mon, 9 Sep 2024 10:12:16 -0400 Subject: [PATCH 2/2] chore(release): 0.0.1-alpha.7 --- .github/workflows/build.yaml | 19 +++++++++++++++++++ CHANGELOG.md | 2 ++ package-lock.json | 4 ++-- package.json | 2 +- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d66e459..dbdfe5a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -33,12 +33,20 @@ jobs: id: project-name run: | PROJECT_NAME=$(jq -r '.name' package.json) + if [ -z "$PROJECT_NAME" ]; then + echo "Project name not found in package.json!" + exit 1 + fi echo "PROJECT_NAME=$PROJECT_NAME" >> $GITHUB_ENV - name: Get tag name id: tag-name run: | TAGNAME=$(echo $GITHUB_REF | cut -d / -f 3) + if [ -z "$TAGNAME" ]; then + echo "TAGNAME is empty!" + exit 1 + fi echo "TAGNAME=$TAGNAME" >> $GITHUB_ENV - name: Determine Docker Tag @@ -61,6 +69,17 @@ jobs: - name: Build and Push Docker Image run: | + echo "Building and pushing Docker image..." + echo "PROJECT_NAME: ${{ env.PROJECT_NAME }}" + echo "DOCKER_TAG: ${{ env.DOCKER_TAG }}" + echo "TAGNAME: ${{ steps.tag-name.outputs.TAGNAME }}" + + # Ensure PROJECT_NAME, DOCKER_TAG, and TAGNAME are not empty + if [ -z "${{ env.PROJECT_NAME }}" ] || [ -z "${{ env.DOCKER_TAG }}" ] || [ -z "${{ steps.tag-name.outputs.TAGNAME }}" ]; then + echo "Error: One of the required variables is empty!" + exit 1 + fi + docker build -t ${{ vars.DOCKER_NAMESPACE }}/${{ env.PROJECT_NAME }}:${{ env.DOCKER_TAG }} . docker tag ${{ vars.DOCKER_NAMESPACE }}/${{ env.PROJECT_NAME }}:${{ env.DOCKER_TAG }} ${{ vars.DOCKER_NAMESPACE }}/${{ env.PROJECT_NAME }}:${{ steps.tag-name.outputs.TAGNAME }} docker push ${{ vars.DOCKER_NAMESPACE }}/${{ env.PROJECT_NAME }}:${{ env.DOCKER_TAG }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a3393c..5d4bacc 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.7](https://github.com/DIG-Network/dig-content-server/compare/v0.0.1-alpha.6...v0.0.1-alpha.7) (2024-09-09) + ### [0.0.1-alpha.6](https://github.com/DIG-Network/dig-content-server/compare/v0.0.1-alpha.5...v0.0.1-alpha.6) (2024-09-09) ### [0.0.1-alpha.5](https://github.com/DIG-Network/dig-content-server/compare/v0.0.1-alpha.4...v0.0.1-alpha.5) (2024-09-09) diff --git a/package-lock.json b/package-lock.json index febef28..6482a54 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "dig-cli", - "version": "0.0.1-alpha.6", + "version": "0.0.1-alpha.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "dig-cli", - "version": "0.0.1-alpha.6", + "version": "0.0.1-alpha.7", "license": "ISC", "dependencies": { "async-mutex": "^0.5.0", diff --git a/package.json b/package.json index 45e4f69..8fed559 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dig-content-server", - "version": "0.0.1-alpha.6", + "version": "0.0.1-alpha.7", "description": "", "type": "commonjs", "main": "./dist/index.js",