From 7125cf5a5bb670dbe324665044f20ac6b4d5034a Mon Sep 17 00:00:00 2001
From: Koen Metsu <koen@metsu.be>
Date: Wed, 18 Oct 2023 11:15:40 +0200
Subject: [PATCH] build: or-1955 use needs even more, and reduce nr of steps

---
 .github/workflows/main.yml | 11 +++--------
 OrganisationRegistry.sln   |  3 +++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 335a208ba..c9cd090ba 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.set-version.outputs.version }}
-      installationToken: ${{ steps.set_generated_token.outputs.installationToken }}
+      installationToken: ${{ steps.generate_token.outputs.installationToken }}
     steps:
       - name: Checkout Code
         uses: actions/checkout@v3
@@ -36,11 +36,6 @@ jobs:
           APP_ID: ${{ secrets.MYBOT_APP_ID }}
           PRIVATE_KEY: ${{ secrets.MYBOT_PRIVATE_KEY }}
 
-      - name: Set Generated Token
-        id: set_generated_token
-        run: echo ::set-output name=installationToken::${{ steps.generate_token.outputs.installationToken }}
-        shell: bash
-
       - name: Run Semantic Release dry-run
         shell: bash
         run: npx semantic-release --dry-run
@@ -358,9 +353,9 @@ jobs:
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
           BUILD_DOCKER_REGISTRY: ${{ secrets.VBR_BUILD_DOCKER_REGISTRY }}
-          GITHUB_TOKEN: ${{ steps.set-release-version.outputs.installationToken  }}
+          GITHUB_TOKEN: ${{ needs.set-release-version.outputs.installationToken  }}
           GIT_COMMIT: ${{ github.sha }}
-          GIT_USERNAME: ${{ steps.set-release-version.outputs.installationToken  }}
+          GIT_USERNAME: ${{ needs.set-release-version.outputs.installationToken  }}
           GIT_AUTHOR_NAME: ${{ secrets.VBR_GIT_USER }}
           GIT_COMMITTER_NAME: ${{ secrets.VBR_GIT_USER }}
           GIT_EMAIL: ${{ secrets.VBR_GIT_EMAIL }}
diff --git a/OrganisationRegistry.sln b/OrganisationRegistry.sln
index f5f49f495..095711586 100755
--- a/OrganisationRegistry.sln
+++ b/OrganisationRegistry.sln
@@ -75,6 +75,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrganisationRegistry.MagdaReRegistration", "src\OrganisationRegistry.MagdaReRegistration\OrganisationRegistry.MagdaReRegistration.csproj", "{3757D695-6832-4FAF-B4E2-4B02262956F8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{7CA3FAD8-5352-4788-9A94-6519B5BFBDD6}"
+	ProjectSection(SolutionItems) = preProject
+		.github\generate-token.js = .github\generate-token.js
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{C31A5E2C-7DFC-48B0-97BB-0D870EE713BD}"
 ProjectSection(SolutionItems) = preProject