chore: Improve workflows (#2547)

streetsidesoftware · Feb 26, 2023 · e8ebb08 · e8ebb08
1 parent 8cc1841
commit e8ebb08
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 21 deletions.
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
@@ -27,6 +27,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: yarn
       - run: yarn --frozen-lockfile
+      - run: yarn build
       - run: xvfb-run -a yarn run test-client-integration
         if: runner.os == 'Linux'
       - run: yarn run test-client-integration

diff --git a/.github/workflows/manual-publish.yml b/.github/workflows/manual-publish.yml
@@ -32,7 +32,10 @@ jobs:
         with:
           ref: ${{ inputs.ref }}
       - name: Install
-        run: yarn install
+        run: |
+          yarn install
+          yarn build
+
       - name: Build Extension .vsix
         run: yarn run package-extension
       - name: Publish VSCE

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -26,6 +26,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: yarn
       - run: yarn --frozen-lockfile
+      - run: yarn build
       - run: yarn test
       # Ensure the repository is clean after build & test
       - run: git --no-pager diff --compact-summary --exit-code

diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml
@@ -29,10 +29,7 @@ jobs:
           yarn upgrade
           yarn package-json-dependency-updater --update
           yarn
-      - name: Has changes
-        run: |
-          git --no-pager diff --compact-summary  --exit-code && echo "git_status=clean" >> $GITHUB_ENV || echo "git_status=dirty" >> $GITHUB_ENV
-          git --no-pager diff --compact-summary
+
       - name: Gen Body
         run: |
           echo "git_body<<DIFF" >> $GITHUB_ENV
@@ -48,22 +45,14 @@ jobs:
           echo "" >> $GITHUB_ENV
           git --no-pager diff --stat  >> $GITHUB_ENV
           echo "DIFF" >> $GITHUB_ENV
-      - name: Echo git_status
-        run: echo ${{ env.git_status }}
-      - uses: tibdex/github-app-token@v1.8 # cspell:ignore tibdex
-        if: env.git_status == 'dirty'
-        id: generate-token
-        with:
-          app_id: ${{ secrets.AUTOMATION_APP_ID }}
-          private_key: ${{ secrets.AUTOMATION_PRIVATE_KEY }}
-      - name: Create Pull Request
-        if: env.git_status == 'dirty'
-        uses: peter-evans/create-pull-request@v4
+
+      - name: PR
+        uses: ./.github/actions/pr
         with:
-          commit-message: "ci: Workflow Bot -- Update ALL Dependencies"
+          commit-message: "ci: Update ALL Dependencies -- Workflow Bot"
           branch: ${{ env.NEW_BRANCH }}
           base: ${{ env.REF_BRANCH }}
-          title: "ci: Workflow Bot -- Update ALL Dependencies (${{ env.REF_BRANCH }})"
-          token: ${{ steps.generate-token.outputs.token }}
+          title: "ci: Update ALL Dependencies (${{ env.REF_BRANCH }}) -- Workflow Bot"
           body: ${{ env.git_body }}
-          delete-branch: true
+          app_id: ${{ secrets.AUTOMATION_APP_ID }}
+          app_private_key: ${{ secrets.AUTOMATION_PRIVATE_KEY }}
diff --git a/package.json b/package.json
@@ -2506,7 +2506,7 @@
   },
   "scripts": {
     "build-package-schema": "yarn workspace server build-schema && build-tools update-package-schema && yarn prettier:fix-schema",
-    "postinstall": "yarn run build",
+    "postinstall": "echo postinstall",
     "build": "yarn build:workspaces && yarn build:schema && yarn build:docs && yarn build:readme",
     "build:docs": "yarn run gen-docs",
     "build:readme": "inject-markdown README.md && prettier -w README.md",