Merge pull request #534 from github/aeisenberg/mergeback-fix

aeisenberg · web-flow · commit 4b4a5ee9d122 · 2021-06-01T10:35:47.000-07:00
Fix the mergeback workflow
diff --git a/.github/update-release-branch.py b/.github/update-release-branch.py
@@ -8,8 +8,7 @@
 import datetime
 import os
 
-EMPTY_CHANGELOG = """
-# CodeQL Action and CodeQL Runner Changelog
+EMPTY_CHANGELOG = """# CodeQL Action and CodeQL Runner Changelog
 
 ## [UNRELEASED]
 
diff --git a/.github/workflows/post-release-mergeback.yml b/.github/workflows/post-release-mergeback.yml
@@ -74,24 +74,27 @@ jobs:
           set +e # don't fail on an errored command
           git ls-remote --tags origin | grep "$VERSION"
           EXISTS="$?"
-          if [ "$EXISTS" -ne 0 ]; then
-             echo "::set-output name=exists::true"
-             echo "Tag $TAG exists. Not going to re-release."
+          if [ "$EXISTS" -eq 0 ]; then
+            echo "Tag $TAG exists. Not going to re-release."
+            echo "::set-output name=exists::true"
+          else
+            echo "Tag $TAG does not exist yet."
           fi
 
       # we didn't tag the release during the update-release-branch workflow because the
       # commit that actually makes it to the release branch is a merge commit,
       # and not yet known during the first workflow. We tag now because we know the correct commit.
       - name: Tag release
-        if: steps.check.outputs.exists == 'true'
+        if: steps.check.outputs.exists != 'true'
         env:
           VERSION: ${{ steps.getVersion.outputs.version }}
         run: |
           git tag -a "$VERSION" -m "$VERSION"
+          git fetch --unshallow  # unshallow the repo in order to allow pushes
           git push origin --follow-tags "$VERSION"
 
       - name: Create mergeback branch
-        if: steps.check.outputs.exists == 'true'
+        if: steps.check.outputs.exists != 'true'
         env:
           VERSION: "${{ steps.getVersion.outputs.version }}"
           NEW_BRANCH: "${{ steps.getVersion.outputs.newBranch }}"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [UNRELEASED]
 
+## 1.0.0 - 31 May 2021
+
 - Add this changelog file. [#507](https://github.com/github/codeql-action/pull/507)
 - Improve grouping of analysis logs. Add a new log group containing a summary of metrics and diagnostics, if they were produced by CodeQL builtin queries. [#515](https://github.com/github/codeql-action/pull/515)
-- Add metrics and diagnostics summaries from custom query suites to the analysis summary log group. [#532](https://github.com/github/codeql-action/pull/532) 
+- Add metrics and diagnostics summaries from custom query suites to the analysis summary log group. [#532](https://github.com/github/codeql-action/pull/532)
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "private": true,
   "description": "CodeQL action",
   "scripts": {
@@ -10,7 +10,7 @@
     "lint": "eslint --report-unused-disable-directives --max-warnings=0 . --ext .js,.ts",
     "lint-fix": "eslint --report-unused-disable-directives --max-warnings=0 . --ext .js,.ts --fix",
     "removeNPMAbsolutePaths": "removeNPMAbsolutePaths . --force",
-    "version": "cd runner && npm version patch && git add ."
+    "version": "cd runner && npm version patch && cd .. && npm run removeNPMAbsolutePaths && git add runner"
   },
   "ava": {
     "typescript": {
diff --git a/runner/package-lock.json b/runner/package-lock.json
diff --git a/runner/package.json b/runner/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codeql-runner",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "private": true,
   "description": "CodeQL runner",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "codeql-runner",`
`3`		`- "version": "1.0.0",`
	`3`	`+ "version": "1.0.1",`
`4`	`4`	`"private": true,`
`5`	`5`	`"description": "CodeQL runner",`
`6`	`6`	`"scripts": {`