diff --git a/.github/workflows/architecture/release-process.png b/.github/workflows/architecture/release-process.png index 62a99e4aff..662f334763 100644 Binary files a/.github/workflows/architecture/release-process.png and b/.github/workflows/architecture/release-process.png differ diff --git a/.github/workflows/architecture/release-process.puml b/.github/workflows/architecture/release-process.puml index 9af3ac00d5..307091d6aa 100644 --- a/.github/workflows/architecture/release-process.puml +++ b/.github/workflows/architecture/release-process.puml @@ -10,7 +10,7 @@ participant Discord as discord user -> github : New Commit on master (from PR, or directly) ...waiting for commit push event to fire... -github -> create : Push a new git tag, patch incrementing latest SemVer +github -> create : Push a new git tag, patch incrementing latest Version alt from-pr? case create -> create : Use links to the PR as a description else was a commit diff --git a/.github/workflows/linux-workflow.yml b/.github/workflows/linux-workflow.yml index 70fdfda63a..c001f77efb 100644 --- a/.github/workflows/linux-workflow.yml +++ b/.github/workflows/linux-workflow.yml @@ -199,7 +199,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.BOT_PAT }} ASSET_DIR: ${{ github.WORKSPACE }}/ci-artifacts - ASSET_EXTENSION: "AppImage" + ASSET_EXTENSION: AppImage TAG_TO_SEARCH_FOR: ${{ github.REF }} run: | cd ./.github/workflows/scripts/releases/upload-release-artifacts diff --git a/.github/workflows/release-announce.yml b/.github/workflows/release-announce.yml index 9aabfed0a7..c8d52337ea 100644 --- a/.github/workflows/release-announce.yml +++ b/.github/workflows/release-announce.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/setup-node@v2 with: - node-version: '16' + node-version: 16 - name: Announce Release env: diff --git a/.github/workflows/release-push-tag-and-draft.yml b/.github/workflows/release-push-tag-and-draft.yml index 6a3247910c..0dead4f7ff 100644 --- a/.github/workflows/release-push-tag-and-draft.yml +++ b/.github/workflows/release-push-tag-and-draft.yml @@ -1,6 +1,6 @@ # Whenever a commit is pushed to master (ideally via a pull-request!) # this action will create the next release, which means: -# 1. tag master with the proper semver +# 1. tag master with the proper version # 2. create a new draft release (pre-released if a nightly build) # 3. add release notes @@ -17,8 +17,8 @@ on: # description: 'Should it be a stable release?' # required: true # default: 'false' - # semverTag: - # description: 'The semantic version to tag with' + # versionTag: + # description: 'The version to tag with' # required: true jobs: @@ -30,7 +30,7 @@ jobs: # Docs - https://github.com/mathieudutour/github-tag-action # Workflows cannot trigger other workflows implicitly # - https://github.community/t/github-actions-workflow-not-triggering-with-tag-push/17053/7 - - name: Bump SemVer and Push Tag + - name: Bump Version and Push Tag id: tag_version uses: mathieudutour/github-tag-action@v5.6 with: diff --git a/.github/workflows/scripts/releases/generate-release-notes/index.js b/.github/workflows/scripts/releases/generate-release-notes/index.js index bd37fa40d6..86d6365028 100644 --- a/.github/workflows/scripts/releases/generate-release-notes/index.js +++ b/.github/workflows/scripts/releases/generate-release-notes/index.js @@ -52,7 +52,7 @@ const { data: associatedPulls } = await octokit.rest.repos.listPullRequestsAssoc let releaseNotes = ``; -if (associatedPulls.length == 0) { +if (associatedPulls.length === 0) { releaseNotes += `- ${commit.commit.message}\n`; } else { for (var j = 0; j < associatedPulls.length; j++) { diff --git a/.github/workflows/windows-workflow.yml b/.github/workflows/windows-workflow.yml index 9671e7e9e5..37e67d8a03 100644 --- a/.github/workflows/windows-workflow.yml +++ b/.github/workflows/windows-workflow.yml @@ -167,14 +167,9 @@ jobs: continue-on-error: true with: name: ${{ steps.artifact-metadata.outputs.name }}-symbols - path: | - ./bin/**/*.pdb + path: ./bin/**/*.pdb # ---- Release / Tagging related steps ---- - - name: Install Dependencies - if: startsWith(github.ref, 'refs/tags/') && matrix.configuration != 'CMake' - run: choco install 7zip.install - - name: Prepare Build Artifacts if: startsWith(github.ref, 'refs/tags/') && matrix.configuration != 'CMake' run: | @@ -188,7 +183,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.BOT_PAT }} ASSET_DIR: ${{ github.WORKSPACE }}/ci-artifacts - ASSET_EXTENSION: "7z" + ASSET_EXTENSION: 7z TAG_TO_SEARCH_FOR: ${{ github.REF }} run: | cd ./.github/workflows/scripts/releases/upload-release-artifacts