From 651087d202c6449ff492d493db1bbcb8352ced00 Mon Sep 17 00:00:00 2001 From: Michael Taylor Date: Mon, 9 Sep 2024 09:30:01 -0400 Subject: [PATCH 1/6] chore(release): bump version to 0.0.1-alpha.2 --- release.sh => scripts/release.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) rename release.sh => scripts/release.sh (71%) diff --git a/release.sh b/scripts/release.sh similarity index 71% rename from release.sh rename to scripts/release.sh index efa574f..fd428cc 100644 --- a/release.sh +++ b/scripts/release.sh @@ -7,19 +7,19 @@ if [ "$CURRENT_BRANCH" != "develop" ]; then exit 1 fi -# Extract the current version from package.json -VERSION=$(jq -r '.version' package.json) - -# Create a new feature branch based on the version -FEATURE_BRANCH="release/v$VERSION" -git checkout -b "$FEATURE_BRANCH" - # Run standard-version for version bumping npx standard-version --prerelease alpha +# Extract the new version from package.json after bumping +NEW_VERSION=$(jq -r '.version' package.json) + +# Create a new feature branch based on the new version +FEATURE_BRANCH="release/v$NEW_VERSION" +git checkout -b "$FEATURE_BRANCH" + # Commit changes git add . -git commit -m "chore(release): bump version to $VERSION" +git commit -m "chore(release): bump version to $NEW_VERSION" # Notify the user about the feature branch echo "Version bumped and committed on branch $FEATURE_BRANCH." From 478a878332df17facb21e17f1c9504767b726596 Mon Sep 17 00:00:00 2001 From: Michael Taylor Date: Mon, 9 Sep 2024 10:12:16 -0400 Subject: [PATCH 2/6] 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", From 899ef05f249d43dca1dc411118504cdf597cab5f Mon Sep 17 00:00:00 2001 From: Michael Taylor Date: Mon, 9 Sep 2024 10:23:45 -0400 Subject: [PATCH 3/6] ci: build.yaml --- .github/workflows/build.yaml | 14 +++++++++----- package.json | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index dbdfe5a..ec937d0 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -39,10 +39,14 @@ jobs: fi echo "PROJECT_NAME=$PROJECT_NAME" >> $GITHUB_ENV + - name: Debug GITHUB_REF + run: | + echo "GITHUB_REF: $GITHUB_REF" + - name: Get tag name id: tag-name run: | - TAGNAME=$(echo $GITHUB_REF | cut -d / -f 3) + TAGNAME=$(echo $GITHUB_REF | sed 's/refs\/tags\///') if [ -z "$TAGNAME" ]; then echo "TAGNAME is empty!" exit 1 @@ -72,15 +76,15 @@ jobs: 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 }}" + echo "TAGNAME: ${{ env.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 + if [ -z "${{ env.PROJECT_NAME }}" ] || [ -z "${{ env.DOCKER_TAG }}" ] || [ -z "${{ env.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 tag ${{ vars.DOCKER_NAMESPACE }}/${{ env.PROJECT_NAME }}:${{ env.DOCKER_TAG }} ${{ vars.DOCKER_NAMESPACE }}/${{ env.PROJECT_NAME }}:${{ env.TAGNAME }} docker push ${{ vars.DOCKER_NAMESPACE }}/${{ env.PROJECT_NAME }}:${{ env.DOCKER_TAG }} - docker push ${{ vars.DOCKER_NAMESPACE }}/${{ env.PROJECT_NAME }}:${{ steps.tag-name.outputs.TAGNAME }} + docker push ${{ vars.DOCKER_NAMESPACE }}/${{ env.PROJECT_NAME }}:${{ env.TAGNAME }} diff --git a/package.json b/package.json index 8fed559..6063124 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dig-content-server", - "version": "0.0.1-alpha.7", + "version": "0.0.1-alpha.8", "description": "", "type": "commonjs", "main": "./dist/index.js", From ee987a73e8b0edaddb2e40edb5dbf7e39bb284e9 Mon Sep 17 00:00:00 2001 From: Michael Taylor Date: Wed, 18 Sep 2024 12:23:15 -0400 Subject: [PATCH 4/6] chore(release): 0.0.1-alpha.33 --- CHANGELOG.md | 7 +++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af20c96..787bcde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ 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.33](https://github.com/DIG-Network/dig-content-server/compare/v0.0.1-alpha.32...v0.0.1-alpha.33) (2024-09-18) + + +### Bug Fixes + +* duplicate path part ([fb1f26f](https://github.com/DIG-Network/dig-content-server/commit/fb1f26f779b15a9da13fe90a8a0d5cec87659c3d)) + ### [0.0.1-alpha.32](https://github.com/DIG-Network/dig-content-server/compare/v0.0.1-alpha.31...v0.0.1-alpha.32) (2024-09-18) diff --git a/package-lock.json b/package-lock.json index 5eaef78..96fb73a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "dig-content-server", - "version": "0.0.1-alpha.32", + "version": "0.0.1-alpha.33", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "dig-content-server", - "version": "0.0.1-alpha.32", + "version": "0.0.1-alpha.33", "license": "ISC", "dependencies": { "@dignetwork/dig-sdk": "^0.0.1-alpha.21", diff --git a/package.json b/package.json index 9008533..42ebe10 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dig-content-server", - "version": "0.0.1-alpha.32", + "version": "0.0.1-alpha.33", "description": "", "type": "commonjs", "main": "./dist/index.js", From d1956b88967b3bb78e5a512e806628e6e08065c6 Mon Sep 17 00:00:00 2001 From: Michael Taylor Date: Sun, 29 Sep 2024 13:59:08 -0400 Subject: [PATCH 5/6] chore(release): 0.0.1-alpha.59 --- CHANGELOG.md | 8 ++++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2d913a..19e28b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ 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.59](https://github.com/DIG-Network/dig-content-server/compare/v0.0.1-alpha.58...v0.0.1-alpha.59) (2024-09-29) + + +### Features + +* mv clvm into the container directly ([5bc80eb](https://github.com/DIG-Network/dig-content-server/commit/5bc80ebb9a1090f768025c56354fc41c903cfd50)) +* mv clvm into the container directly ([1f41f90](https://github.com/DIG-Network/dig-content-server/commit/1f41f907a6d8e8247aaffd2bcbe9a3640433d9aa)) + ### [0.0.1-alpha.58](https://github.com/DIG-Network/dig-content-server/compare/v0.0.1-alpha.57...v0.0.1-alpha.58) (2024-09-29) diff --git a/package-lock.json b/package-lock.json index ca12fab..ab3960b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "dig-content-server", - "version": "0.0.1-alpha.58", + "version": "0.0.1-alpha.59", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "dig-content-server", - "version": "0.0.1-alpha.58", + "version": "0.0.1-alpha.59", "license": "ISC", "dependencies": { "@dignetwork/datalayer-driver": "^0.1.28", diff --git a/package.json b/package.json index 7ca5c02..cb604d5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dig-content-server", - "version": "0.0.1-alpha.58", + "version": "0.0.1-alpha.59", "description": "", "type": "commonjs", "main": "./dist/index.js", From 24ac6faac93bb91295f06a17b4be2fbcc76d856b Mon Sep 17 00:00:00 2001 From: Michael Taylor Date: Sun, 29 Sep 2024 14:05:21 -0400 Subject: [PATCH 6/6] chore(release): 0.0.1-alpha.60 --- CHANGELOG.md | 8 ++++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19e28b3..5a5a5aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ 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.60](https://github.com/DIG-Network/dig-content-server/compare/v0.0.1-alpha.58...v0.0.1-alpha.60) (2024-09-29) + + +### Features + +* mv clvm into the container directly ([5bc80eb](https://github.com/DIG-Network/dig-content-server/commit/5bc80ebb9a1090f768025c56354fc41c903cfd50)) +* mv clvm into the container directly ([1f41f90](https://github.com/DIG-Network/dig-content-server/commit/1f41f907a6d8e8247aaffd2bcbe9a3640433d9aa)) + ### [0.0.1-alpha.59](https://github.com/DIG-Network/dig-content-server/compare/v0.0.1-alpha.58...v0.0.1-alpha.59) (2024-09-29) diff --git a/package-lock.json b/package-lock.json index ab3960b..5e99d2e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "dig-content-server", - "version": "0.0.1-alpha.59", + "version": "0.0.1-alpha.60", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "dig-content-server", - "version": "0.0.1-alpha.59", + "version": "0.0.1-alpha.60", "license": "ISC", "dependencies": { "@dignetwork/datalayer-driver": "^0.1.28", diff --git a/package.json b/package.json index cb604d5..3973f72 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dig-content-server", - "version": "0.0.1-alpha.59", + "version": "0.0.1-alpha.60", "description": "", "type": "commonjs", "main": "./dist/index.js",