From 7476cd48297c65bc0400718053b1106522259be2 Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Mon, 6 Jan 2025 21:40:10 -0800 Subject: [PATCH 01/50] Enforce labels --- .github/workflows/deployment.yaml | 2 +- .github/workflows/label.yaml | 90 ++++++++++++++++++++++++ .github/workflows/label_enforcement.yaml | 45 ++++++++++++ .github/workflows/release.yaml | 55 +++++++++++++++ 4 files changed, 191 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/label.yaml create mode 100644 .github/workflows/label_enforcement.yaml create mode 100644 .github/workflows/release.yaml diff --git a/.github/workflows/deployment.yaml b/.github/workflows/deployment.yaml index 98bfe24..d59f8c2 100644 --- a/.github/workflows/deployment.yaml +++ b/.github/workflows/deployment.yaml @@ -37,4 +37,4 @@ jobs: release: needs: build name: Release - uses: gitops-ci-cd/.github/.github/workflows/release.yaml@main + uses: ./.github/workflows/release.yaml diff --git a/.github/workflows/label.yaml b/.github/workflows/label.yaml new file mode 100644 index 0000000..d3f0a8d --- /dev/null +++ b/.github/workflows/label.yaml @@ -0,0 +1,90 @@ +on: + pull_request: + types: + - labeled + +permissions: + contents: read + pull-requests: write + +name: Label + +jobs: + label: + runs-on: ubuntu-latest + if: contains(fromJSON('["major", "minor", "patch"]'), github.event.label.name) + env: + CURRENT_VERSION: v0.0.0 + NEW_VERSION: v0.1.0 + SEMVER_REGEX: '[0-9]*\.[0-9]*\.[0-9]*' + + steps: + - uses: actions/checkout@v4 + - name: Fetch Tags and Determine Current Version + run: | + git fetch --tags + current_version=$(git tag --list "v[0-9]*" --sort=-v:refname | head -n 1) + if [ -n "$current_version" ]; then + echo "CURRENT_VERSION=$current_version" >> $GITHUB_ENV + fi + - name: Calculate New Version + run: | + # Extract current version + version=${{ env.CURRENT_VERSION }} + major=$(echo $version | cut -d'.' -f1) + minor=$(echo $version | cut -d'.' -f2) + patch=$(echo $version | cut -d'.' -f3) + + # Determine the bump type + case "${{ github.event.label.name }}" in + major) new_version="v$((major + 1)).0.0";; + minor) new_version="v$major.$((minor + 1)).0";; + patch) new_version="v$major.$minor.$((patch + 1))";; + esac + + echo "NEW_VERSION=$new_version" >> $GITHUB_ENV + - if: hashFiles('package.json') != '' + run: | + echo "JavaScript detected." + sed -i.bak 's/"version": "$SEMVER_REGEX"/"version": "'$NEW_VERSION'"/' package.json + echo "Updated package.json" + - if: hashFiles('*.csproj') != '' + run: | + echo ".NET detected." + for csproj in *.csproj; do + [ -e "$csproj" ] || continue + sed -i.bak 's|$SEMVER_REGEX|'$NEW_VERSION'|' "$csproj" + echo "Updated $csproj" + done + - if: hashFiles('Directory.Build.props') != '' + run: | + echo ".NET detected." + sed -i.bak 's|$SEMVER_REGEX|'$NEW_VERSION'|' Directory.Build.props + echo "Updated Directory.Build.props" + - if: hashFiles('setup.py') != '' + run: | + echo "Python detected." + sed -i.bak "s/version='$SEMVER_REGEX'/version='$NEW_VERSION'/" setup.py + echo "Updated setup.py" + - if: hashFiles('pyproject.toml') != '' + run: | + echo "Python detected." + sed -i.bak 's/^version = "$SEMVER_REGEX"/version = "'$NEW_VERSION'"/' pyproject.toml + echo "Updated pyproject.toml" + - if: hashFiles('build.gradle') != '' + run: | + echo "Java detected." + sed -i.bak 's/version = "$SEMVER_REGEX"/version = "'$NEW_VERSION'"/' build.gradle + echo "Updated build.gradle" + - if: hashFiles('build.gradle.kts') != '' + run: | + echo "Kotlin detected." + sed -i.bak 's/version = "$SEMVER_REGEX"/version = "'$NEW_VERSION'"/' build.gradle.kts + echo "Updated build.gradle.kts" + - name: Commit and Push Changes + run: | + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + git add . + git commit -m "Bump version to ${{ env.new_version }}" + git push origin ${{ github.event.pull_request.head.ref }} diff --git a/.github/workflows/label_enforcement.yaml b/.github/workflows/label_enforcement.yaml new file mode 100644 index 0000000..5034d45 --- /dev/null +++ b/.github/workflows/label_enforcement.yaml @@ -0,0 +1,45 @@ +on: + pull_request: + types: + - opened + - reopened + - unlabeled + +permissions: + contents: read + pull-requests: write + +name: Label Enforcement + +jobs: + label: + runs-on: ubuntu-latest + env: + VALID_LABEL_FOUND: "false" + + steps: + - name: Check for "major" Label + if: contains(github.event.pull_request.labels.*.name, 'major') + run: | + echo "Found 'major' label." + echo "VALID_LABEL_FOUND=true" >> $GITHUB_ENV + + - name: Check for "minor" Label + if: contains(github.event.pull_request.labels.*.name, 'minor') + run: | + echo "Found 'minor' label." + echo "VALID_LABEL_FOUND=true" >> $GITHUB_ENV + + - name: Check for "patch" Label + if: contains(github.event.pull_request.labels.*.name, 'patch') + run: | + echo "Found 'patch' label." + echo "VALID_LABEL_FOUND=true" >> $GITHUB_ENV + + - name: Add "minor" Label (Default) + if: env.VALID_LABEL_FOUND == 'false' + run: | + echo "No valid label found. Adding 'minor'." + gh pr edit ${{ github.event.pull_request.number }} --add-label "minor" + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 0000000..89297c3 --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,55 @@ +name: Detect Current Version + +on: + workflow_call: + +permissions: + contents: read + +jobs: + detect-version: + runs-on: ubuntu-latest + env: + SEMVER_REGEX: '[0-9]*\.[0-9]*\.[0-9]*' + DETECTED_VERSION: v0.0.0 + + steps: + - uses: actions/checkout@v4 + - if: hashFiles('package.json') != '' + run: | + echo "JavaScript detected." + echo "DETECTED_VERSION=v$(grep -oP '"version": "\K'"$SEMVER_REGEX package.json)" >> $GITHUB_ENV + - if: hashFiles('*.csproj') != '' + run: | + echo ".NET detected." + for csproj in *.csproj; do + [ -e "$csproj" ] || continue + echo "DETECTED_VERSION=v$(grep -oP '\K'"$SEMVER_REGEX" "$csproj")" >> $GITHUB_ENV + done + - if: hashFiles('Directory.Build.props') != '' + run: | + echo ".NET detected." + echo "DETECTED_VERSION=v$(grep -oP '\K'"$SEMVER_REGEX" Directory.Build.props)" >> $GITHUB_ENV + - if: hashFiles('setup.py') != '' + run: | + echo "Python detected." + echo "DETECTED_VERSION=v$(grep -oP "version='\K'"$SEMVER_REGEX" setup.py)" >> $GITHUB_ENV + - if: hashFiles('pyproject.toml') != '' + run: | + echo "Python detected." + echo "DETECTED_VERSION=v$(grep -oP 'version = "\K'"$SEMVER_REGEX" pyproject.toml)" >> $GITHUB_ENV + - if: hashFiles('build.gradle') != '' + run: | + echo "Java detected." + echo "DETECTED_VERSION=v$(grep -oP 'version = "\K'"$SEMVER_REGEX" build.gradle)" >> $GITHUB_ENV + - if: hashFiles('build.gradle.kts') != '' + run: | + echo "Kotlin detected." + echo "DETECTED_VERSION=v$(grep -oP 'version = "\K'"$SEMVER_REGEX" build.gradle.kts)" >> $GITHUB_ENV + - name: Output Detected Version + run: | + if [ -n "$DETECTED_VERSION" ]; then + echo "Detected Version: $DETECTED_VERSION" + else + echo "No version detected." + fi From eb2027361897dc50b64dbeeca12b622897c61e8c Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Mon, 6 Jan 2025 21:41:45 -0800 Subject: [PATCH 02/50] whoops --- .github/workflows/label_enforcement.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/label_enforcement.yaml b/.github/workflows/label_enforcement.yaml index 5034d45..470f2f5 100644 --- a/.github/workflows/label_enforcement.yaml +++ b/.github/workflows/label_enforcement.yaml @@ -18,6 +18,7 @@ jobs: VALID_LABEL_FOUND: "false" steps: + - uses: actions/checkout@v4 - name: Check for "major" Label if: contains(github.event.pull_request.labels.*.name, 'major') run: | From 35ac7b43856209f673dbe6526b49da6ea9a4f65c Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Mon, 6 Jan 2025 21:42:35 -0800 Subject: [PATCH 03/50] for testing --- .github/workflows/label_enforcement.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/label_enforcement.yaml b/.github/workflows/label_enforcement.yaml index 470f2f5..4f4eb38 100644 --- a/.github/workflows/label_enforcement.yaml +++ b/.github/workflows/label_enforcement.yaml @@ -4,6 +4,7 @@ on: - opened - reopened - unlabeled + - synchronize permissions: contents: read From a5df9dda09a724f53b15bc9ba1e0c440a6ecc74d Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 12:50:36 -0800 Subject: [PATCH 04/50] single action --- .github/workflows/label_enforcement.yaml | 47 ------------------- ...bel.yaml => semver_label_enforcement.yaml} | 35 ++++++++++++-- 2 files changed, 32 insertions(+), 50 deletions(-) delete mode 100644 .github/workflows/label_enforcement.yaml rename .github/workflows/{label.yaml => semver_label_enforcement.yaml} (74%) diff --git a/.github/workflows/label_enforcement.yaml b/.github/workflows/label_enforcement.yaml deleted file mode 100644 index 4f4eb38..0000000 --- a/.github/workflows/label_enforcement.yaml +++ /dev/null @@ -1,47 +0,0 @@ -on: - pull_request: - types: - - opened - - reopened - - unlabeled - - synchronize - -permissions: - contents: read - pull-requests: write - -name: Label Enforcement - -jobs: - label: - runs-on: ubuntu-latest - env: - VALID_LABEL_FOUND: "false" - - steps: - - uses: actions/checkout@v4 - - name: Check for "major" Label - if: contains(github.event.pull_request.labels.*.name, 'major') - run: | - echo "Found 'major' label." - echo "VALID_LABEL_FOUND=true" >> $GITHUB_ENV - - - name: Check for "minor" Label - if: contains(github.event.pull_request.labels.*.name, 'minor') - run: | - echo "Found 'minor' label." - echo "VALID_LABEL_FOUND=true" >> $GITHUB_ENV - - - name: Check for "patch" Label - if: contains(github.event.pull_request.labels.*.name, 'patch') - run: | - echo "Found 'patch' label." - echo "VALID_LABEL_FOUND=true" >> $GITHUB_ENV - - - name: Add "minor" Label (Default) - if: env.VALID_LABEL_FOUND == 'false' - run: | - echo "No valid label found. Adding 'minor'." - gh pr edit ${{ github.event.pull_request.number }} --add-label "minor" - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/label.yaml b/.github/workflows/semver_label_enforcement.yaml similarity index 74% rename from .github/workflows/label.yaml rename to .github/workflows/semver_label_enforcement.yaml index d3f0a8d..dc00f4c 100644 --- a/.github/workflows/label.yaml +++ b/.github/workflows/semver_label_enforcement.yaml @@ -1,25 +1,54 @@ on: pull_request: types: - - labeled + - opened + - reopened + - unlabeled + - synchronize permissions: contents: read pull-requests: write -name: Label +name: SemVer Label Enforcement jobs: label: runs-on: ubuntu-latest - if: contains(fromJSON('["major", "minor", "patch"]'), github.event.label.name) env: + VALID_LABEL_FOUND: "false" CURRENT_VERSION: v0.0.0 NEW_VERSION: v0.1.0 SEMVER_REGEX: '[0-9]*\.[0-9]*\.[0-9]*' steps: - uses: actions/checkout@v4 + - name: Check for "major" Label + if: contains(github.event.pull_request.labels.*.name, 'major') + run: | + echo "Found 'major' label." + echo "VALID_LABEL_FOUND=true" >> $GITHUB_ENV + + - name: Check for "minor" Label + if: contains(github.event.pull_request.labels.*.name, 'minor') + run: | + echo "Found 'minor' label." + echo "VALID_LABEL_FOUND=true" >> $GITHUB_ENV + + - name: Check for "patch" Label + if: contains(github.event.pull_request.labels.*.name, 'patch') + run: | + echo "Found 'patch' label." + echo "VALID_LABEL_FOUND=true" >> $GITHUB_ENV + + - name: Add "minor" Label (Default) + if: env.VALID_LABEL_FOUND == 'false' + run: | + echo "No valid label found. Adding 'minor'." + gh pr edit ${{ github.event.pull_request.number }} --add-label "minor" + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Fetch Tags and Determine Current Version run: | git fetch --tags From 55b938dbb478a4197d378584f6ed8a4c6bcc6414 Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 12:58:41 -0800 Subject: [PATCH 05/50] ref --- .github/workflows/semver_label_enforcement.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/semver_label_enforcement.yaml b/.github/workflows/semver_label_enforcement.yaml index dc00f4c..784387d 100644 --- a/.github/workflows/semver_label_enforcement.yaml +++ b/.github/workflows/semver_label_enforcement.yaml @@ -23,6 +23,8 @@ jobs: steps: - uses: actions/checkout@v4 + with: + ref: ${{ github.event.pull_request.head.ref }} - name: Check for "major" Label if: contains(github.event.pull_request.labels.*.name, 'major') run: | @@ -116,4 +118,4 @@ jobs: git config user.email "github-actions[bot]@users.noreply.github.com" git add . git commit -m "Bump version to ${{ env.new_version }}" - git push origin ${{ github.event.pull_request.head.ref }} + git push -u origin HEAD From 020f0c1b80f41c26b7b4377ef7e25e6122c1baa9 Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 13:04:13 -0800 Subject: [PATCH 06/50] write --- .github/workflows/semver_label_enforcement.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/semver_label_enforcement.yaml b/.github/workflows/semver_label_enforcement.yaml index 784387d..a466f38 100644 --- a/.github/workflows/semver_label_enforcement.yaml +++ b/.github/workflows/semver_label_enforcement.yaml @@ -7,7 +7,7 @@ on: - synchronize permissions: - contents: read + contents: write pull-requests: write name: SemVer Label Enforcement @@ -117,5 +117,5 @@ jobs: git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" git add . - git commit -m "Bump version to ${{ env.new_version }}" + git commit -m "Bump version to ${{ env.NEW_VERSION }}" git push -u origin HEAD From 21f97ca2c47be9a397a8395656ee5609b2216ad6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 7 Jan 2025 21:04:31 +0000 Subject: [PATCH 07/50] Bump version to --- package.json.bak | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package.json.bak diff --git a/package.json.bak b/package.json.bak new file mode 100644 index 0000000..1d53354 --- /dev/null +++ b/package.json.bak @@ -0,0 +1,26 @@ +{ + "name": "acme-node", + "type": "module", + "version": "0.6.1", + "description": "Sample Application with developer friendly boilerplate", + "scripts": { + "start": "node ./src/index.js", + "lint": "eslint .", + "test": "mocha" + }, + "author": "brett@dudo.io", + "license": "MIT", + "dependencies": { + "@grpc/grpc-js": "^1.12.4", + "@opentelemetry/api": "^1.9.0", + "@opentelemetry/auto-instrumentations-node": "^0.55.0", + "express": "^4.21.1" + }, + "devDependencies": { + "@eslint/js": "^9.14.0", + "eslint": "^9.14.0", + "globals": "^15.12.0", + "mocha": "^10.8.2", + "supertest": "^7.0.0" + } +} From 4e45fda3decba90e446c4b9490bd9af2c191ffa5 Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 14:29:47 -0800 Subject: [PATCH 08/50] sed syntax --- .github/workflows/semver_label_enforcement.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/semver_label_enforcement.yaml b/.github/workflows/semver_label_enforcement.yaml index a466f38..8c06110 100644 --- a/.github/workflows/semver_label_enforcement.yaml +++ b/.github/workflows/semver_label_enforcement.yaml @@ -77,7 +77,7 @@ jobs: - if: hashFiles('package.json') != '' run: | echo "JavaScript detected." - sed -i.bak 's/"version": "$SEMVER_REGEX"/"version": "'$NEW_VERSION'"/' package.json + sed -i "s/\"version\": \"${SEMVER_REGEX}\"/\"version\": \"${NEW_VERSION}\"/" package.json echo "Updated package.json" - if: hashFiles('*.csproj') != '' run: | From ffd5bb87203d698af8d20b20911f22cbedec944f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 7 Jan 2025 22:30:03 +0000 Subject: [PATCH 09/50] Bump version to --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1d53354..a5dd8aa 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "acme-node", "type": "module", - "version": "0.6.1", + "version": "", "description": "Sample Application with developer friendly boilerplate", "scripts": { "start": "node ./src/index.js", From 2bd0496a032217d76997a7654a97b510087858ad Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 14:51:47 -0800 Subject: [PATCH 10/50] INCREMENT_LABEL --- .../workflows/semver_label_enforcement.yaml | 57 ++++++++++--------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/.github/workflows/semver_label_enforcement.yaml b/.github/workflows/semver_label_enforcement.yaml index 8c06110..cfe4edf 100644 --- a/.github/workflows/semver_label_enforcement.yaml +++ b/.github/workflows/semver_label_enforcement.yaml @@ -16,7 +16,7 @@ jobs: label: runs-on: ubuntu-latest env: - VALID_LABEL_FOUND: "false" + INCREMENT_LABEL: "" CURRENT_VERSION: v0.0.0 NEW_VERSION: v0.1.0 SEMVER_REGEX: '[0-9]*\.[0-9]*\.[0-9]*' @@ -25,29 +25,27 @@ jobs: - uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.ref }} - - name: Check for "major" Label - if: contains(github.event.pull_request.labels.*.name, 'major') + - name: Check for "patch" Label + if: contains(github.event.pull_request.labels.*.name, 'patch') run: | - echo "Found 'major' label." - echo "VALID_LABEL_FOUND=true" >> $GITHUB_ENV - + echo "Found 'patch' label." + echo "INCREMENT_LABEL=patch" >> $GITHUB_ENV - name: Check for "minor" Label if: contains(github.event.pull_request.labels.*.name, 'minor') run: | echo "Found 'minor' label." - echo "VALID_LABEL_FOUND=true" >> $GITHUB_ENV - - - name: Check for "patch" Label - if: contains(github.event.pull_request.labels.*.name, 'patch') + echo "INCREMENT_LABEL=minor" >> $GITHUB_ENV + - name: Check for "major" Label + if: contains(github.event.pull_request.labels.*.name, 'major') run: | - echo "Found 'patch' label." - echo "VALID_LABEL_FOUND=true" >> $GITHUB_ENV - - - name: Add "minor" Label (Default) - if: env.VALID_LABEL_FOUND == 'false' + echo "Found 'major' label." + echo "INCREMENT_LABEL=major" >> $GITHUB_ENV + - name: Add default Label + if: env.INCREMENT_LABEL == '' run: | - echo "No valid label found. Adding 'minor'." - gh pr edit ${{ github.event.pull_request.number }} --add-label "minor" + echo "INCREMENT_LABEL=minor" >> $GITHUB_ENV + echo "No valid label found. Adding '$INCREMENT_LABEL'." + gh pr edit ${{ github.event.pull_request.number }} --add-label ${{ env.INCREMENT_LABEL }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -67,19 +65,21 @@ jobs: patch=$(echo $version | cut -d'.' -f3) # Determine the bump type - case "${{ github.event.label.name }}" in + case "${{ env.INCREMENT_LABEL }}" in major) new_version="v$((major + 1)).0.0";; minor) new_version="v$major.$((minor + 1)).0";; patch) new_version="v$major.$minor.$((patch + 1))";; esac echo "NEW_VERSION=$new_version" >> $GITHUB_ENV - - if: hashFiles('package.json') != '' + - name: Check for JavaScript + if: hashFiles('package.json') != '' run: | echo "JavaScript detected." - sed -i "s/\"version\": \"${SEMVER_REGEX}\"/\"version\": \"${NEW_VERSION}\"/" package.json + jq '.version = "${NEW_VERSION}"' package.json > tmp.json && mv tmp.json package.json echo "Updated package.json" - - if: hashFiles('*.csproj') != '' + - name: Check for .NET + if: hashFiles('*.csproj') != '' run: | echo ".NET detected." for csproj in *.csproj; do @@ -87,27 +87,32 @@ jobs: sed -i.bak 's|$SEMVER_REGEX|'$NEW_VERSION'|' "$csproj" echo "Updated $csproj" done - - if: hashFiles('Directory.Build.props') != '' + - name: Check for .NET + if: hashFiles('Directory.Build.props') != '' run: | echo ".NET detected." sed -i.bak 's|$SEMVER_REGEX|'$NEW_VERSION'|' Directory.Build.props echo "Updated Directory.Build.props" - - if: hashFiles('setup.py') != '' + - name: Check for Python + if: hashFiles('setup.py') != '' run: | echo "Python detected." sed -i.bak "s/version='$SEMVER_REGEX'/version='$NEW_VERSION'/" setup.py echo "Updated setup.py" - - if: hashFiles('pyproject.toml') != '' + - name: Check for Python + if: hashFiles('pyproject.toml') != '' run: | echo "Python detected." sed -i.bak 's/^version = "$SEMVER_REGEX"/version = "'$NEW_VERSION'"/' pyproject.toml echo "Updated pyproject.toml" - - if: hashFiles('build.gradle') != '' + - name: Check for Java + if: hashFiles('build.gradle') != '' run: | echo "Java detected." sed -i.bak 's/version = "$SEMVER_REGEX"/version = "'$NEW_VERSION'"/' build.gradle echo "Updated build.gradle" - - if: hashFiles('build.gradle.kts') != '' + - name: Check for Kotlin + if: hashFiles('build.gradle.kts') != '' run: | echo "Kotlin detected." sed -i.bak 's/version = "$SEMVER_REGEX"/version = "'$NEW_VERSION'"/' build.gradle.kts From 3c5c339d5733d45cbb412405e9a32b8576d1101f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 7 Jan 2025 22:52:05 +0000 Subject: [PATCH 11/50] Bump version to vv0.7.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a5dd8aa..075d35a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "acme-node", "type": "module", - "version": "", + "version": "${NEW_VERSION}", "description": "Sample Application with developer friendly boilerplate", "scripts": { "start": "node ./src/index.js", From cdbce729c200ef4dce4aae2b75dbae7dfdeb762f Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 14:54:59 -0800 Subject: [PATCH 12/50] sed --- .github/workflows/semver_label_enforcement.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/semver_label_enforcement.yaml b/.github/workflows/semver_label_enforcement.yaml index cfe4edf..a91c52a 100644 --- a/.github/workflows/semver_label_enforcement.yaml +++ b/.github/workflows/semver_label_enforcement.yaml @@ -76,7 +76,7 @@ jobs: if: hashFiles('package.json') != '' run: | echo "JavaScript detected." - jq '.version = "${NEW_VERSION}"' package.json > tmp.json && mv tmp.json package.json + sed -i "s/\"version\": \"${SEMVER_REGEX}\"/\"version\": \"${NEW_VERSION}\"/" package.json echo "Updated package.json" - name: Check for .NET if: hashFiles('*.csproj') != '' From e08b496e4a1ba8c1c7bda970221473ae5873fb8d Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 14:56:20 -0800 Subject: [PATCH 13/50] v --- .github/workflows/semver_label_enforcement.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/semver_label_enforcement.yaml b/.github/workflows/semver_label_enforcement.yaml index a91c52a..49fea52 100644 --- a/.github/workflows/semver_label_enforcement.yaml +++ b/.github/workflows/semver_label_enforcement.yaml @@ -66,9 +66,9 @@ jobs: # Determine the bump type case "${{ env.INCREMENT_LABEL }}" in - major) new_version="v$((major + 1)).0.0";; - minor) new_version="v$major.$((minor + 1)).0";; - patch) new_version="v$major.$minor.$((patch + 1))";; + major) new_version="$((major + 1)).0.0";; + minor) new_version="$major.$((minor + 1)).0";; + patch) new_version="$major.$minor.$((patch + 1))";; esac echo "NEW_VERSION=$new_version" >> $GITHUB_ENV From 635b09aa6b9e228003daebb04b6400aed8b5243d Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 14:59:20 -0800 Subject: [PATCH 14/50] sed --- .github/workflows/semver_label_enforcement.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/semver_label_enforcement.yaml b/.github/workflows/semver_label_enforcement.yaml index 49fea52..e284164 100644 --- a/.github/workflows/semver_label_enforcement.yaml +++ b/.github/workflows/semver_label_enforcement.yaml @@ -76,7 +76,7 @@ jobs: if: hashFiles('package.json') != '' run: | echo "JavaScript detected." - sed -i "s/\"version\": \"${SEMVER_REGEX}\"/\"version\": \"${NEW_VERSION}\"/" package.json + sed -i "s/\"version\": \"${SEMVER_REGEX}\"/\"version\": \"${{ env.NEW_VERSION }}\"/" package.json echo "Updated package.json" - name: Check for .NET if: hashFiles('*.csproj') != '' From 59529cfa024044b66394dd569e7a62b3ac68a986 Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 15:01:39 -0800 Subject: [PATCH 15/50] sed --- .github/workflows/semver_label_enforcement.yaml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/semver_label_enforcement.yaml b/.github/workflows/semver_label_enforcement.yaml index e284164..49fea52 100644 --- a/.github/workflows/semver_label_enforcement.yaml +++ b/.github/workflows/semver_label_enforcement.yaml @@ -76,7 +76,7 @@ jobs: if: hashFiles('package.json') != '' run: | echo "JavaScript detected." - sed -i "s/\"version\": \"${SEMVER_REGEX}\"/\"version\": \"${{ env.NEW_VERSION }}\"/" package.json + sed -i "s/\"version\": \"${SEMVER_REGEX}\"/\"version\": \"${NEW_VERSION}\"/" package.json echo "Updated package.json" - name: Check for .NET if: hashFiles('*.csproj') != '' diff --git a/package.json b/package.json index 075d35a..1d53354 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "acme-node", "type": "module", - "version": "${NEW_VERSION}", + "version": "0.6.1", "description": "Sample Application with developer friendly boilerplate", "scripts": { "start": "node ./src/index.js", From 156be5e5c7564d815375f7212d956a025898f296 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 7 Jan 2025 23:02:01 +0000 Subject: [PATCH 16/50] Bump version to v0.7.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1d53354..cefd54e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "acme-node", "type": "module", - "version": "0.6.1", + "version": "v0.7.0", "description": "Sample Application with developer friendly boilerplate", "scripts": { "start": "node ./src/index.js", From 1e501f9617b012f6ccb5579b054140779903d841 Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 15:04:56 -0800 Subject: [PATCH 17/50] v --- .github/workflows/semver_label_enforcement.yaml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/semver_label_enforcement.yaml b/.github/workflows/semver_label_enforcement.yaml index 49fea52..c796433 100644 --- a/.github/workflows/semver_label_enforcement.yaml +++ b/.github/workflows/semver_label_enforcement.yaml @@ -59,7 +59,7 @@ jobs: - name: Calculate New Version run: | # Extract current version - version=${{ env.CURRENT_VERSION }} + version=${{ env.CURRENT_VERSION }}#v major=$(echo $version | cut -d'.' -f1) minor=$(echo $version | cut -d'.' -f2) patch=$(echo $version | cut -d'.' -f3) diff --git a/package.json b/package.json index cefd54e..1d53354 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "acme-node", "type": "module", - "version": "v0.7.0", + "version": "0.6.1", "description": "Sample Application with developer friendly boilerplate", "scripts": { "start": "node ./src/index.js", From b9dedb2a8c6402bfa3aefd7d7bbc2cebea217873 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 7 Jan 2025 23:05:16 +0000 Subject: [PATCH 18/50] Bump version to v0.7.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1d53354..cefd54e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "acme-node", "type": "module", - "version": "0.6.1", + "version": "v0.7.0", "description": "Sample Application with developer friendly boilerplate", "scripts": { "start": "node ./src/index.js", From 6e2ed79320347839616ab55ad6c352bc04587c9f Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 15:07:05 -0800 Subject: [PATCH 19/50] bash --- .github/workflows/semver_label_enforcement.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/semver_label_enforcement.yaml b/.github/workflows/semver_label_enforcement.yaml index c796433..84995f5 100644 --- a/.github/workflows/semver_label_enforcement.yaml +++ b/.github/workflows/semver_label_enforcement.yaml @@ -59,7 +59,7 @@ jobs: - name: Calculate New Version run: | # Extract current version - version=${{ env.CURRENT_VERSION }}#v + version=${CURRENT_VERSION#v} major=$(echo $version | cut -d'.' -f1) minor=$(echo $version | cut -d'.' -f2) patch=$(echo $version | cut -d'.' -f3) From 5e3258af6cd38f15768b4da6e8889470e475df46 Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 15:08:00 -0800 Subject: [PATCH 20/50] v --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cefd54e..1d53354 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "acme-node", "type": "module", - "version": "v0.7.0", + "version": "0.6.1", "description": "Sample Application with developer friendly boilerplate", "scripts": { "start": "node ./src/index.js", From 2048b63eec688f3cd755cb77e3c94268fd0f5c17 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 7 Jan 2025 23:08:17 +0000 Subject: [PATCH 21/50] Bump version to 0.7.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1d53354..5524dfa 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "acme-node", "type": "module", - "version": "0.6.1", + "version": "0.7.0", "description": "Sample Application with developer friendly boilerplate", "scripts": { "start": "node ./src/index.js", From 050a8207511754209ed6143c6849afaa2aa194d5 Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 15:10:23 -0800 Subject: [PATCH 22/50] $ --- .github/workflows/semver_label_enforcement.yaml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/semver_label_enforcement.yaml b/.github/workflows/semver_label_enforcement.yaml index 84995f5..7cfdb4c 100644 --- a/.github/workflows/semver_label_enforcement.yaml +++ b/.github/workflows/semver_label_enforcement.yaml @@ -76,7 +76,7 @@ jobs: if: hashFiles('package.json') != '' run: | echo "JavaScript detected." - sed -i "s/\"version\": \"${SEMVER_REGEX}\"/\"version\": \"${NEW_VERSION}\"/" package.json + sed -i "s/\"version\": \"$SEMVER_REGEX\"/\"version\": \"$NEW_VERSION\"/" package.json echo "Updated package.json" - name: Check for .NET if: hashFiles('*.csproj') != '' diff --git a/package.json b/package.json index 5524dfa..1d53354 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "acme-node", "type": "module", - "version": "0.7.0", + "version": "0.6.1", "description": "Sample Application with developer friendly boilerplate", "scripts": { "start": "node ./src/index.js", From aba9abbb87c3085e9e8e4a4201833c470cda19f8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 7 Jan 2025 23:10:43 +0000 Subject: [PATCH 23/50] Bump version to 0.7.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1d53354..5524dfa 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "acme-node", "type": "module", - "version": "0.6.1", + "version": "0.7.0", "description": "Sample Application with developer friendly boilerplate", "scripts": { "start": "node ./src/index.js", From 58dbb03cf2cd12d14c51d9da495e5c2b2a116116 Mon Sep 17 00:00:00 2001 From: Brett Dudo Date: Tue, 7 Jan 2025 15:11:14 -0800 Subject: [PATCH 24/50] Delete package.json.bak --- package.json.bak | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 package.json.bak diff --git a/package.json.bak b/package.json.bak deleted file mode 100644 index 1d53354..0000000 --- a/package.json.bak +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "acme-node", - "type": "module", - "version": "0.6.1", - "description": "Sample Application with developer friendly boilerplate", - "scripts": { - "start": "node ./src/index.js", - "lint": "eslint .", - "test": "mocha" - }, - "author": "brett@dudo.io", - "license": "MIT", - "dependencies": { - "@grpc/grpc-js": "^1.12.4", - "@opentelemetry/api": "^1.9.0", - "@opentelemetry/auto-instrumentations-node": "^0.55.0", - "express": "^4.21.1" - }, - "devDependencies": { - "@eslint/js": "^9.14.0", - "eslint": "^9.14.0", - "globals": "^15.12.0", - "mocha": "^10.8.2", - "supertest": "^7.0.0" - } -} From adbb8e7959d04f2c0b283bd9ea6fb1efa09d1dc5 Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 15:11:36 -0800 Subject: [PATCH 25/50] remove sync --- .github/workflows/semver_label_enforcement.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/semver_label_enforcement.yaml b/.github/workflows/semver_label_enforcement.yaml index 7cfdb4c..1c0ec1b 100644 --- a/.github/workflows/semver_label_enforcement.yaml +++ b/.github/workflows/semver_label_enforcement.yaml @@ -4,7 +4,6 @@ on: - opened - reopened - unlabeled - - synchronize permissions: contents: write From d333a440f847cd0a0188d128cf33ccdd98258cda Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 15:17:57 -0800 Subject: [PATCH 26/50] echo --- .../workflows/semver_label_enforcement.yaml | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/.github/workflows/semver_label_enforcement.yaml b/.github/workflows/semver_label_enforcement.yaml index 1c0ec1b..639c1ad 100644 --- a/.github/workflows/semver_label_enforcement.yaml +++ b/.github/workflows/semver_label_enforcement.yaml @@ -44,7 +44,7 @@ jobs: run: | echo "INCREMENT_LABEL=minor" >> $GITHUB_ENV echo "No valid label found. Adding '$INCREMENT_LABEL'." - gh pr edit ${{ github.event.pull_request.number }} --add-label ${{ env.INCREMENT_LABEL }} + gh pr edit ${{ github.event.pull_request.number }} --add-label $INCREMENT_LABEL env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -55,6 +55,7 @@ jobs: if [ -n "$current_version" ]; then echo "CURRENT_VERSION=$current_version" >> $GITHUB_ENV fi + echo "Current Version: $current_version" - name: Calculate New Version run: | # Extract current version @@ -64,62 +65,63 @@ jobs: patch=$(echo $version | cut -d'.' -f3) # Determine the bump type - case "${{ env.INCREMENT_LABEL }}" in + case "$INCREMENT_LABEL" in major) new_version="$((major + 1)).0.0";; minor) new_version="$major.$((minor + 1)).0";; patch) new_version="$major.$minor.$((patch + 1))";; esac echo "NEW_VERSION=$new_version" >> $GITHUB_ENV + echo "New Version: $new_version" - name: Check for JavaScript if: hashFiles('package.json') != '' run: | - echo "JavaScript detected." + echo "JavaScript detected..." sed -i "s/\"version\": \"$SEMVER_REGEX\"/\"version\": \"$NEW_VERSION\"/" package.json echo "Updated package.json" - name: Check for .NET if: hashFiles('*.csproj') != '' run: | - echo ".NET detected." + echo ".NET detected..." for csproj in *.csproj; do [ -e "$csproj" ] || continue - sed -i.bak 's|$SEMVER_REGEX|'$NEW_VERSION'|' "$csproj" + sed -i 's|$SEMVER_REGEX|'$NEW_VERSION'|' "$csproj" echo "Updated $csproj" done - name: Check for .NET if: hashFiles('Directory.Build.props') != '' run: | - echo ".NET detected." - sed -i.bak 's|$SEMVER_REGEX|'$NEW_VERSION'|' Directory.Build.props + echo ".NET detected..." + sed -i 's|$SEMVER_REGEX|'$NEW_VERSION'|' Directory.Build.props echo "Updated Directory.Build.props" - name: Check for Python if: hashFiles('setup.py') != '' run: | - echo "Python detected." - sed -i.bak "s/version='$SEMVER_REGEX'/version='$NEW_VERSION'/" setup.py + echo "Python detected..." + sed -i "s/version='$SEMVER_REGEX'/version='$NEW_VERSION'/" setup.py echo "Updated setup.py" - name: Check for Python if: hashFiles('pyproject.toml') != '' run: | - echo "Python detected." - sed -i.bak 's/^version = "$SEMVER_REGEX"/version = "'$NEW_VERSION'"/' pyproject.toml + echo "Python detected..." + sed -i 's/^version = "$SEMVER_REGEX"/version = "'$NEW_VERSION'"/' pyproject.toml echo "Updated pyproject.toml" - name: Check for Java if: hashFiles('build.gradle') != '' run: | - echo "Java detected." - sed -i.bak 's/version = "$SEMVER_REGEX"/version = "'$NEW_VERSION'"/' build.gradle + echo "Java detected..." + sed -i 's/version = "$SEMVER_REGEX"/version = "'$NEW_VERSION'"/' build.gradle echo "Updated build.gradle" - name: Check for Kotlin if: hashFiles('build.gradle.kts') != '' run: | - echo "Kotlin detected." - sed -i.bak 's/version = "$SEMVER_REGEX"/version = "'$NEW_VERSION'"/' build.gradle.kts + echo "Kotlin detected..." + sed -i 's/version = "$SEMVER_REGEX"/version = "'$NEW_VERSION'"/' build.gradle.kts echo "Updated build.gradle.kts" - name: Commit and Push Changes run: | git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" git add . - git commit -m "Bump version to ${{ env.NEW_VERSION }}" + git commit -m "Bump version to $NEW_VERSION" git push -u origin HEAD From ae07f573d7d4e7956db7768ce9121f50b3234fe8 Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 15:23:19 -0800 Subject: [PATCH 27/50] bash --- .github/workflows/semver_label_enforcement.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/semver_label_enforcement.yaml b/.github/workflows/semver_label_enforcement.yaml index 639c1ad..152fa80 100644 --- a/.github/workflows/semver_label_enforcement.yaml +++ b/.github/workflows/semver_label_enforcement.yaml @@ -42,9 +42,10 @@ jobs: - name: Add default Label if: env.INCREMENT_LABEL == '' run: | - echo "INCREMENT_LABEL=minor" >> $GITHUB_ENV - echo "No valid label found. Adding '$INCREMENT_LABEL'." - gh pr edit ${{ github.event.pull_request.number }} --add-label $INCREMENT_LABEL + increment_label=minor + echo "INCREMENT_LABEL=$increment_label" >> $GITHUB_ENV + echo "No valid label found. Adding '$increment_label'." + gh pr edit ${{ github.event.pull_request.number }} --add-label $increment_label env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From c83e9a5c12ec15eead2e6693cc0717b470752d36 Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 15:26:06 -0800 Subject: [PATCH 28/50] echo --- .github/workflows/semver_label_enforcement.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/semver_label_enforcement.yaml b/.github/workflows/semver_label_enforcement.yaml index 152fa80..2673773 100644 --- a/.github/workflows/semver_label_enforcement.yaml +++ b/.github/workflows/semver_label_enforcement.yaml @@ -49,7 +49,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Fetch Tags and Determine Current Version + - name: Determine Current Version run: | git fetch --tags current_version=$(git tag --list "v[0-9]*" --sort=-v:refname | head -n 1) @@ -65,7 +65,6 @@ jobs: minor=$(echo $version | cut -d'.' -f2) patch=$(echo $version | cut -d'.' -f3) - # Determine the bump type case "$INCREMENT_LABEL" in major) new_version="$((major + 1)).0.0";; minor) new_version="$major.$((minor + 1)).0";; @@ -73,7 +72,7 @@ jobs: esac echo "NEW_VERSION=$new_version" >> $GITHUB_ENV - echo "New Version: $new_version" + echo "New Version: v$new_version" - name: Check for JavaScript if: hashFiles('package.json') != '' run: | From a4822d2816df51b4f103211eb24e3755ed3ce919 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 7 Jan 2025 23:30:00 +0000 Subject: [PATCH 29/50] Bump version to 1.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5524dfa..5091d52 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "acme-node", "type": "module", - "version": "0.7.0", + "version": "1.0.0", "description": "Sample Application with developer friendly boilerplate", "scripts": { "start": "node ./src/index.js", From 64f4da65751f64baff8c4dbac205226ac5777e6f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 7 Jan 2025 23:30:38 +0000 Subject: [PATCH 30/50] Bump version to 0.6.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5091d52..a726ac3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "acme-node", "type": "module", - "version": "1.0.0", + "version": "0.6.2", "description": "Sample Application with developer friendly boilerplate", "scripts": { "start": "node ./src/index.js", From a2f77e1a2614df69cf5fd5c3bc6140e3c3a945d8 Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 15:35:34 -0800 Subject: [PATCH 31/50] bash --- .github/workflows/semver_label_enforcement.yaml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/semver_label_enforcement.yaml b/.github/workflows/semver_label_enforcement.yaml index 2673773..a55fbe7 100644 --- a/.github/workflows/semver_label_enforcement.yaml +++ b/.github/workflows/semver_label_enforcement.yaml @@ -16,8 +16,8 @@ jobs: runs-on: ubuntu-latest env: INCREMENT_LABEL: "" - CURRENT_VERSION: v0.0.0 - NEW_VERSION: v0.1.0 + CURRENT_VERSION: "v0.0.0" + NEW_VERSION: "0.1.0" SEMVER_REGEX: '[0-9]*\.[0-9]*\.[0-9]*' steps: @@ -45,25 +45,26 @@ jobs: increment_label=minor echo "INCREMENT_LABEL=$increment_label" >> $GITHUB_ENV echo "No valid label found. Adding '$increment_label'." - gh pr edit ${{ github.event.pull_request.number }} --add-label $increment_label + gh pr edit $PR_NUMBER --add-label $increment_label env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PR_NUMBER: ${{ github.event.pull_request.number }} - name: Determine Current Version run: | git fetch --tags current_version=$(git tag --list "v[0-9]*" --sort=-v:refname | head -n 1) if [ -n "$current_version" ]; then + current_version=${current_version#v} echo "CURRENT_VERSION=$current_version" >> $GITHUB_ENV fi echo "Current Version: $current_version" - name: Calculate New Version run: | - # Extract current version - version=${CURRENT_VERSION#v} - major=$(echo $version | cut -d'.' -f1) - minor=$(echo $version | cut -d'.' -f2) - patch=$(echo $version | cut -d'.' -f3) + # Extract current version$CURRENT_VERSION + major=$(echo $CURRENT_VERSION | cut -d'.' -f1) + minor=$(echo $CURRENT_VERSION | cut -d'.' -f2) + patch=$(echo $CURRENT_VERSION | cut -d'.' -f3) case "$INCREMENT_LABEL" in major) new_version="$((major + 1)).0.0";; From 62d7668ad7b4ab2744ccc11eac4adceb27ed460a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 7 Jan 2025 23:36:45 +0000 Subject: [PATCH 32/50] Bump version to 0.7.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a726ac3..5524dfa 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "acme-node", "type": "module", - "version": "0.6.2", + "version": "0.7.0", "description": "Sample Application with developer friendly boilerplate", "scripts": { "start": "node ./src/index.js", From 4f96ff1a8a5e52f3948f1a58050329c0097b0390 Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 15:41:25 -0800 Subject: [PATCH 33/50] bash --- .github/workflows/semver_label_enforcement.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/semver_label_enforcement.yaml b/.github/workflows/semver_label_enforcement.yaml index a55fbe7..e3cf40e 100644 --- a/.github/workflows/semver_label_enforcement.yaml +++ b/.github/workflows/semver_label_enforcement.yaml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest env: INCREMENT_LABEL: "" - CURRENT_VERSION: "v0.0.0" + CURRENT_VERSION: "0.0.0" NEW_VERSION: "0.1.0" SEMVER_REGEX: '[0-9]*\.[0-9]*\.[0-9]*' @@ -61,7 +61,6 @@ jobs: echo "Current Version: $current_version" - name: Calculate New Version run: | - # Extract current version$CURRENT_VERSION major=$(echo $CURRENT_VERSION | cut -d'.' -f1) minor=$(echo $CURRENT_VERSION | cut -d'.' -f2) patch=$(echo $CURRENT_VERSION | cut -d'.' -f3) @@ -73,7 +72,7 @@ jobs: esac echo "NEW_VERSION=$new_version" >> $GITHUB_ENV - echo "New Version: v$new_version" + echo "New Version: $new_version" - name: Check for JavaScript if: hashFiles('package.json') != '' run: | From 79e479d0d267cb792bdc0eeaaaf5254d947ce2bc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 7 Jan 2025 23:41:55 +0000 Subject: [PATCH 34/50] Bump version to 1.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5524dfa..5091d52 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "acme-node", "type": "module", - "version": "0.7.0", + "version": "1.0.0", "description": "Sample Application with developer friendly boilerplate", "scripts": { "start": "node ./src/index.js", From b2278e242d63f62820c2a8652d911a9b592f738f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 7 Jan 2025 23:43:17 +0000 Subject: [PATCH 35/50] Bump version to 0.7.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5091d52..5524dfa 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "acme-node", "type": "module", - "version": "1.0.0", + "version": "0.7.0", "description": "Sample Application with developer friendly boilerplate", "scripts": { "start": "node ./src/index.js", From 3e58209788477b2f919efcc75f1da60fdfc3c8d8 Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 16:36:55 -0800 Subject: [PATCH 36/50] Use shared workflow --- .github/workflows/bump_version.yaml | 17 +++ .github/workflows/release.yaml | 21 ++- .../workflows/semver_label_enforcement.yaml | 127 ------------------ 3 files changed, 31 insertions(+), 134 deletions(-) create mode 100644 .github/workflows/bump_version.yaml delete mode 100644 .github/workflows/semver_label_enforcement.yaml diff --git a/.github/workflows/bump_version.yaml b/.github/workflows/bump_version.yaml new file mode 100644 index 0000000..08505e3 --- /dev/null +++ b/.github/workflows/bump_version.yaml @@ -0,0 +1,17 @@ +on: + pull_request: + types: + - opened + - reopened + - unlabeled + +permissions: + contents: write + pull-requests: write + +name: Bump Version + +jobs: + bump: + name: Bump + uses: gitops-ci-cd/.github/.github/workflows/bump_version.yaml@main diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 89297c3..fabce40 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -15,34 +15,41 @@ jobs: steps: - uses: actions/checkout@v4 - - if: hashFiles('package.json') != '' + - name: Check for JavaScript + if: hashFiles('package.json') != '' run: | echo "JavaScript detected." echo "DETECTED_VERSION=v$(grep -oP '"version": "\K'"$SEMVER_REGEX package.json)" >> $GITHUB_ENV - - if: hashFiles('*.csproj') != '' + - name: Check for .NET + if: hashFiles('*.csproj') != '' run: | echo ".NET detected." for csproj in *.csproj; do [ -e "$csproj" ] || continue echo "DETECTED_VERSION=v$(grep -oP '\K'"$SEMVER_REGEX" "$csproj")" >> $GITHUB_ENV done - - if: hashFiles('Directory.Build.props') != '' + - name: Check for .NET + if: hashFiles('Directory.Build.props') != '' run: | echo ".NET detected." echo "DETECTED_VERSION=v$(grep -oP '\K'"$SEMVER_REGEX" Directory.Build.props)" >> $GITHUB_ENV - - if: hashFiles('setup.py') != '' + - name: Check for Python + if: hashFiles('setup.py') != '' run: | echo "Python detected." echo "DETECTED_VERSION=v$(grep -oP "version='\K'"$SEMVER_REGEX" setup.py)" >> $GITHUB_ENV - - if: hashFiles('pyproject.toml') != '' + - name: Check for Python + if: hashFiles('pyproject.toml') != '' run: | echo "Python detected." echo "DETECTED_VERSION=v$(grep -oP 'version = "\K'"$SEMVER_REGEX" pyproject.toml)" >> $GITHUB_ENV - - if: hashFiles('build.gradle') != '' + - name: Check for Java + if: hashFiles('build.gradle') != '' run: | echo "Java detected." echo "DETECTED_VERSION=v$(grep -oP 'version = "\K'"$SEMVER_REGEX" build.gradle)" >> $GITHUB_ENV - - if: hashFiles('build.gradle.kts') != '' + - name: Check for Kotlin + if: hashFiles('build.gradle.kts') != '' run: | echo "Kotlin detected." echo "DETECTED_VERSION=v$(grep -oP 'version = "\K'"$SEMVER_REGEX" build.gradle.kts)" >> $GITHUB_ENV diff --git a/.github/workflows/semver_label_enforcement.yaml b/.github/workflows/semver_label_enforcement.yaml deleted file mode 100644 index e3cf40e..0000000 --- a/.github/workflows/semver_label_enforcement.yaml +++ /dev/null @@ -1,127 +0,0 @@ -on: - pull_request: - types: - - opened - - reopened - - unlabeled - -permissions: - contents: write - pull-requests: write - -name: SemVer Label Enforcement - -jobs: - label: - runs-on: ubuntu-latest - env: - INCREMENT_LABEL: "" - CURRENT_VERSION: "0.0.0" - NEW_VERSION: "0.1.0" - SEMVER_REGEX: '[0-9]*\.[0-9]*\.[0-9]*' - - steps: - - uses: actions/checkout@v4 - with: - ref: ${{ github.event.pull_request.head.ref }} - - name: Check for "patch" Label - if: contains(github.event.pull_request.labels.*.name, 'patch') - run: | - echo "Found 'patch' label." - echo "INCREMENT_LABEL=patch" >> $GITHUB_ENV - - name: Check for "minor" Label - if: contains(github.event.pull_request.labels.*.name, 'minor') - run: | - echo "Found 'minor' label." - echo "INCREMENT_LABEL=minor" >> $GITHUB_ENV - - name: Check for "major" Label - if: contains(github.event.pull_request.labels.*.name, 'major') - run: | - echo "Found 'major' label." - echo "INCREMENT_LABEL=major" >> $GITHUB_ENV - - name: Add default Label - if: env.INCREMENT_LABEL == '' - run: | - increment_label=minor - echo "INCREMENT_LABEL=$increment_label" >> $GITHUB_ENV - echo "No valid label found. Adding '$increment_label'." - gh pr edit $PR_NUMBER --add-label $increment_label - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PR_NUMBER: ${{ github.event.pull_request.number }} - - - name: Determine Current Version - run: | - git fetch --tags - current_version=$(git tag --list "v[0-9]*" --sort=-v:refname | head -n 1) - if [ -n "$current_version" ]; then - current_version=${current_version#v} - echo "CURRENT_VERSION=$current_version" >> $GITHUB_ENV - fi - echo "Current Version: $current_version" - - name: Calculate New Version - run: | - major=$(echo $CURRENT_VERSION | cut -d'.' -f1) - minor=$(echo $CURRENT_VERSION | cut -d'.' -f2) - patch=$(echo $CURRENT_VERSION | cut -d'.' -f3) - - case "$INCREMENT_LABEL" in - major) new_version="$((major + 1)).0.0";; - minor) new_version="$major.$((minor + 1)).0";; - patch) new_version="$major.$minor.$((patch + 1))";; - esac - - echo "NEW_VERSION=$new_version" >> $GITHUB_ENV - echo "New Version: $new_version" - - name: Check for JavaScript - if: hashFiles('package.json') != '' - run: | - echo "JavaScript detected..." - sed -i "s/\"version\": \"$SEMVER_REGEX\"/\"version\": \"$NEW_VERSION\"/" package.json - echo "Updated package.json" - - name: Check for .NET - if: hashFiles('*.csproj') != '' - run: | - echo ".NET detected..." - for csproj in *.csproj; do - [ -e "$csproj" ] || continue - sed -i 's|$SEMVER_REGEX|'$NEW_VERSION'|' "$csproj" - echo "Updated $csproj" - done - - name: Check for .NET - if: hashFiles('Directory.Build.props') != '' - run: | - echo ".NET detected..." - sed -i 's|$SEMVER_REGEX|'$NEW_VERSION'|' Directory.Build.props - echo "Updated Directory.Build.props" - - name: Check for Python - if: hashFiles('setup.py') != '' - run: | - echo "Python detected..." - sed -i "s/version='$SEMVER_REGEX'/version='$NEW_VERSION'/" setup.py - echo "Updated setup.py" - - name: Check for Python - if: hashFiles('pyproject.toml') != '' - run: | - echo "Python detected..." - sed -i 's/^version = "$SEMVER_REGEX"/version = "'$NEW_VERSION'"/' pyproject.toml - echo "Updated pyproject.toml" - - name: Check for Java - if: hashFiles('build.gradle') != '' - run: | - echo "Java detected..." - sed -i 's/version = "$SEMVER_REGEX"/version = "'$NEW_VERSION'"/' build.gradle - echo "Updated build.gradle" - - name: Check for Kotlin - if: hashFiles('build.gradle.kts') != '' - run: | - echo "Kotlin detected..." - sed -i 's/version = "$SEMVER_REGEX"/version = "'$NEW_VERSION'"/' build.gradle.kts - echo "Updated build.gradle.kts" - - name: Commit and Push Changes - run: | - git config user.name "github-actions[bot]" - git config user.email "github-actions[bot]@users.noreply.github.com" - git add . - git commit -m "Bump version to $NEW_VERSION" - git push -u origin HEAD From 03e27b41fc9154116351da95f5ab4e4923090b2e Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 17:30:40 -0800 Subject: [PATCH 37/50] shuffle --- .github/workflows/{bump_version.yaml => version_bump.yaml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename .github/workflows/{bump_version.yaml => version_bump.yaml} (67%) diff --git a/.github/workflows/bump_version.yaml b/.github/workflows/version_bump.yaml similarity index 67% rename from .github/workflows/bump_version.yaml rename to .github/workflows/version_bump.yaml index 08505e3..b4d0075 100644 --- a/.github/workflows/bump_version.yaml +++ b/.github/workflows/version_bump.yaml @@ -9,9 +9,9 @@ permissions: contents: write pull-requests: write -name: Bump Version +name: Version Bump jobs: bump: name: Bump - uses: gitops-ci-cd/.github/.github/workflows/bump_version.yaml@main + uses: gitops-ci-cd/.github/.github/workflows/version_bump.yaml@main From d736516c33f069e5ba3aaf489b93a21503d4988e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 8 Jan 2025 01:35:05 +0000 Subject: [PATCH 38/50] Bump version to 1.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5524dfa..5091d52 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "acme-node", "type": "module", - "version": "0.7.0", + "version": "1.0.0", "description": "Sample Application with developer friendly boilerplate", "scripts": { "start": "node ./src/index.js", From c6b7afba40d414da857c30aeb19d24169eef6e03 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 8 Jan 2025 01:47:51 +0000 Subject: [PATCH 39/50] Bump version to 0.6.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5091d52..a726ac3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "acme-node", "type": "module", - "version": "1.0.0", + "version": "0.6.2", "description": "Sample Application with developer friendly boilerplate", "scripts": { "start": "node ./src/index.js", From 9567ec9546a64d7c34d0c10626451927da54c76c Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 18:12:06 -0800 Subject: [PATCH 40/50] shuffle --- .github/workflows/{version_bump.yaml => bump.yaml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{version_bump.yaml => bump.yaml} (92%) diff --git a/.github/workflows/version_bump.yaml b/.github/workflows/bump.yaml similarity index 92% rename from .github/workflows/version_bump.yaml rename to .github/workflows/bump.yaml index b4d0075..595c372 100644 --- a/.github/workflows/version_bump.yaml +++ b/.github/workflows/bump.yaml @@ -9,7 +9,7 @@ permissions: contents: write pull-requests: write -name: Version Bump +name: Bump jobs: bump: From d66de4f2c321c3461088e23120dde94d8bb0c48a Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 18:16:00 -0800 Subject: [PATCH 41/50] oops --- .github/workflows/bump.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump.yaml b/.github/workflows/bump.yaml index 595c372..1eed492 100644 --- a/.github/workflows/bump.yaml +++ b/.github/workflows/bump.yaml @@ -14,4 +14,4 @@ name: Bump jobs: bump: name: Bump - uses: gitops-ci-cd/.github/.github/workflows/version_bump.yaml@main + uses: gitops-ci-cd/.github/.github/workflows/bump.yaml@main From f4d8486c3b4a5b808e8f512b65c24dea5f27e2b4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 8 Jan 2025 02:17:01 +0000 Subject: [PATCH 42/50] Bump version to 1.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a726ac3..5091d52 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "acme-node", "type": "module", - "version": "0.6.2", + "version": "1.0.0", "description": "Sample Application with developer friendly boilerplate", "scripts": { "start": "node ./src/index.js", From 3459b2c1fb240759ecac783537d94106d4ccaa8f Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 19:35:47 -0800 Subject: [PATCH 43/50] lean on integration action --- .github/workflows/bump.yaml | 17 -------- .github/workflows/integration.yaml | 8 +++- .github/workflows/release.yaml | 62 ------------------------------ 3 files changed, 7 insertions(+), 80 deletions(-) delete mode 100644 .github/workflows/bump.yaml delete mode 100644 .github/workflows/release.yaml diff --git a/.github/workflows/bump.yaml b/.github/workflows/bump.yaml deleted file mode 100644 index 1eed492..0000000 --- a/.github/workflows/bump.yaml +++ /dev/null @@ -1,17 +0,0 @@ -on: - pull_request: - types: - - opened - - reopened - - unlabeled - -permissions: - contents: write - pull-requests: write - -name: Bump - -jobs: - bump: - name: Bump - uses: gitops-ci-cd/.github/.github/workflows/bump.yaml@main diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index 2516967..50d44bd 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -4,6 +4,7 @@ on: - opened - reopened - labeled + - unlabeled - synchronize branches: - main @@ -13,7 +14,8 @@ concurrency: cancel-in-progress: true permissions: - contents: read + contents: write + pull-requests: write packages: write attestations: write id-token: write @@ -30,6 +32,10 @@ jobs: name: Integrate uses: gitops-ci-cd/.github/.github/workflows/test.yaml@main + bump: + name: Integrate + uses: gitops-ci-cd/.github/.github/workflows/bump.yaml@main + deploy: if: github.event.action == 'labeled' && github.event.label.name == 'preview' || github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'preview') name: Deploy diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml deleted file mode 100644 index fabce40..0000000 --- a/.github/workflows/release.yaml +++ /dev/null @@ -1,62 +0,0 @@ -name: Detect Current Version - -on: - workflow_call: - -permissions: - contents: read - -jobs: - detect-version: - runs-on: ubuntu-latest - env: - SEMVER_REGEX: '[0-9]*\.[0-9]*\.[0-9]*' - DETECTED_VERSION: v0.0.0 - - steps: - - uses: actions/checkout@v4 - - name: Check for JavaScript - if: hashFiles('package.json') != '' - run: | - echo "JavaScript detected." - echo "DETECTED_VERSION=v$(grep -oP '"version": "\K'"$SEMVER_REGEX package.json)" >> $GITHUB_ENV - - name: Check for .NET - if: hashFiles('*.csproj') != '' - run: | - echo ".NET detected." - for csproj in *.csproj; do - [ -e "$csproj" ] || continue - echo "DETECTED_VERSION=v$(grep -oP '\K'"$SEMVER_REGEX" "$csproj")" >> $GITHUB_ENV - done - - name: Check for .NET - if: hashFiles('Directory.Build.props') != '' - run: | - echo ".NET detected." - echo "DETECTED_VERSION=v$(grep -oP '\K'"$SEMVER_REGEX" Directory.Build.props)" >> $GITHUB_ENV - - name: Check for Python - if: hashFiles('setup.py') != '' - run: | - echo "Python detected." - echo "DETECTED_VERSION=v$(grep -oP "version='\K'"$SEMVER_REGEX" setup.py)" >> $GITHUB_ENV - - name: Check for Python - if: hashFiles('pyproject.toml') != '' - run: | - echo "Python detected." - echo "DETECTED_VERSION=v$(grep -oP 'version = "\K'"$SEMVER_REGEX" pyproject.toml)" >> $GITHUB_ENV - - name: Check for Java - if: hashFiles('build.gradle') != '' - run: | - echo "Java detected." - echo "DETECTED_VERSION=v$(grep -oP 'version = "\K'"$SEMVER_REGEX" build.gradle)" >> $GITHUB_ENV - - name: Check for Kotlin - if: hashFiles('build.gradle.kts') != '' - run: | - echo "Kotlin detected." - echo "DETECTED_VERSION=v$(grep -oP 'version = "\K'"$SEMVER_REGEX" build.gradle.kts)" >> $GITHUB_ENV - - name: Output Detected Version - run: | - if [ -n "$DETECTED_VERSION" ]; then - echo "Detected Version: $DETECTED_VERSION" - else - echo "No version detected." - fi From 1ac7f499979a4baa633a0fc42d74f1f76357b78f Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 19:50:56 -0800 Subject: [PATCH 44/50] CI --- .env.sample | 5 +++++ compose.yaml | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/.env.sample b/.env.sample index 05998d1..cf79fbc 100644 --- a/.env.sample +++ b/.env.sample @@ -4,3 +4,8 @@ GREETING_SERVICE_URL=localhost:50052 PERSON_SERVICE_URL=localhost:50051 OTEL_SERVICE_NAME=acme-node +OTEL_LOG_LEVEL=debug +OTEL_TRACES_EXPORTER=otlp +OTEL_METRICS_EXPORTER=none +OTEL_LOGS_EXPORTER=none +OTEL_EXPORTER_OTLP_ENDPOINT=http://jaeger:4318 diff --git a/compose.yaml b/compose.yaml index 1fa2ed5..e50c472 100644 --- a/compose.yaml +++ b/compose.yaml @@ -57,6 +57,17 @@ services: volumes: - node_modules:/node_modules:cached + jaeger: + image: jaegertracing/jaeger:latest + ports: + - 16686:16686 # UI http://localhost:16686/ + - 4317:4317 + - 4318:4318 + - 5778:5778 + - 9411:9411 + environment: + - LOG_LEVEL=debug + install: <<: *npm profiles: [tasks] From 968b02dacd65b9ff4343ef9809310dcb0cd2a3a0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 8 Jan 2025 03:53:10 +0000 Subject: [PATCH 45/50] Bump version to 0.7.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5091d52..5524dfa 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "acme-node", "type": "module", - "version": "1.0.0", + "version": "0.7.0", "description": "Sample Application with developer friendly boilerplate", "scripts": { "start": "node ./src/index.js", From 9c9b3a2b081c636fb3949709b7c75682007f032c Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 20:02:01 -0800 Subject: [PATCH 46/50] if --- .github/workflows/integration.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index 50d44bd..2cb8053 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -25,10 +25,12 @@ name: Integration jobs: lint: + if: ! contains(fromJSON('["labeled", "unlabeled"]'), github.event.action) name: Integrate uses: gitops-ci-cd/.github/.github/workflows/lint.yaml@main test: + if: ! contains(fromJSON('["labeled", "unlabeled"]'), github.event.action) name: Integrate uses: gitops-ci-cd/.github/.github/workflows/test.yaml@main From 263f2962dbd1bd461efd37644475aa0728ea94fb Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 20:04:06 -0800 Subject: [PATCH 47/50] if --- .github/workflows/integration.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index 2cb8053..3237fcd 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -25,12 +25,12 @@ name: Integration jobs: lint: - if: ! contains(fromJSON('["labeled", "unlabeled"]'), github.event.action) + if: ${{ !contains(fromJSON('["labeled", "unlabeled"]'), github.event.action) }} name: Integrate uses: gitops-ci-cd/.github/.github/workflows/lint.yaml@main test: - if: ! contains(fromJSON('["labeled", "unlabeled"]'), github.event.action) + if: ${{ !contains(fromJSON('["labeled", "unlabeled"]'), github.event.action) }} name: Integrate uses: gitops-ci-cd/.github/.github/workflows/test.yaml@main From da0018917f2e3ceb26ac87a49ef03d31e10b1433 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 8 Jan 2025 04:07:38 +0000 Subject: [PATCH 48/50] Bump version to 1.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5524dfa..5091d52 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "acme-node", "type": "module", - "version": "0.7.0", + "version": "1.0.0", "description": "Sample Application with developer friendly boilerplate", "scripts": { "start": "node ./src/index.js", From 21c6c50bd623017ec5499f33d78e5fb3b917a78b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 8 Jan 2025 04:10:02 +0000 Subject: [PATCH 49/50] Bump version to 0.7.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5091d52..5524dfa 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "acme-node", "type": "module", - "version": "1.0.0", + "version": "0.7.0", "description": "Sample Application with developer friendly boilerplate", "scripts": { "start": "node ./src/index.js", From dd592a1c3d457598a18ba9edf1348f2fb9b70e66 Mon Sep 17 00:00:00 2001 From: "Brett C. Dudo" Date: Tue, 7 Jan 2025 20:15:54 -0800 Subject: [PATCH 50/50] undo --- .github/workflows/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deployment.yaml b/.github/workflows/deployment.yaml index d59f8c2..98bfe24 100644 --- a/.github/workflows/deployment.yaml +++ b/.github/workflows/deployment.yaml @@ -37,4 +37,4 @@ jobs: release: needs: build name: Release - uses: ./.github/workflows/release.yaml + uses: gitops-ci-cd/.github/.github/workflows/release.yaml@main