clean up (#2018)

.github/actions/pr-setup/action.yaml → .github/actions/setup/action.yaml

@@ -1,5 +1,5 @@
-name: "PR Setup"
-description: "Do necessary setup for jobs in PR workflow"
+name: "Setup"
+description: "Do necessary setup for NX, node, yarn cache and deps install"
 
 runs:
   using: "composite"
@@ -18,10 +18,12 @@ runs:
       id: restore-cache-node_modules
       uses: actions/cache@v4
       with:
-        path: node_modules
+        path: |
+          **/node_modules
+          .yarn/install-state.gz
         key: ${{ runner.os }}-build-cache-deps-${{ hashFiles('yarn.lock') }}
 
-    - name: install depdenencies
+    - name: install dependencies
       if: steps.restore-cache-node_modules.outputs.cache-hit != 'true'
       shell: bash
       run: yarn install --immutable

.github/workflows/build-game-bridge.yaml

@@ -1,7 +1,7 @@
 # Workflow to manually trigger a build of the game bridge with the selected SDK tag
 # and create a PR with the changes to the game SDK repository.
 
-name: Build Game Bridge 
+name: Build Game Bridge
 
 on:
   workflow_dispatch:
@@ -57,36 +57,14 @@ jobs:
         if: ${{ steps.allowed_actors_check.outputs.ALLOWED_ACTOR != 'true' }}
         run: exit 1
 
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-          registry-url: https://registry.npmjs.org/
-          cache: "yarn"
-
-      - name: Restore cached node_modules
-        id: restore-cache-node_modules
-        uses: actions/cache@v4
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-build-cache-deps-${{ hashFiles('yarn.lock') }}
-
-      - name: Install dependencies
-        if: steps.restore-cache-node_modules.outputs.cache-hit != 'true' 
-        run: yarn install --immutable
+      - name: setup
+        uses: ./.github/actions/setup
 
       - name: Set TS SDK hash
         run: echo "TS_SDK_HASH=$(git rev-parse HEAD)" >> $GITHUB_ENV
 
       - name: Build Game Bridge
-        run: cd packages/game-bridge && yarn build
-
-      # make artifacs avilable for download
-      - name: Upload Build Artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: game-bridge-artifacts
-          path: ./packages/game-bridge/dist
+        run: yarn nx run @imtbl/game-bridge:build
 
       - name: Cache build artifacts
         uses: actions/cache@v4
@@ -119,7 +97,7 @@ jobs:
           key: ${{ runner.os }}-game-bridge-build-${{ env.TS_SDK_TAG }}
 
       - name: Check Cache Restore
-        if: steps.restore-cache-game-bridge-build.outputs.cache-hit != 'true' 
+        if: steps.restore-cache-game-bridge-build.outputs.cache-hit != 'true'
         run: echo "Game Bridge build cache not restored, exiting" && exit 1
 
       - name: Checkout Unity SDK Repo

.github/workflows/build-lint-and-test-passport-examples.yaml → .github/workflows/build-lint-and-test-examples.yaml

@@ -1,11 +1,11 @@
-name: Build lint and test all passport examples
+name: Build lint and test all examples
 
 on:
   pull_request:
     branches: [main]
   merge_group:
     branches: [main]
-    
+
 jobs:
   build:
     name: Build
@@ -17,10 +17,10 @@ jobs:
         uses: actions/checkout@v4
 
       - name: setup
-        uses: ./.github/actions/pr-setup
+        uses: ./.github/actions/setup
 
-      - name: Build passport examples
-        run: yarn build:examples:passport
+      - name: Build examples
+        run: yarn build:examples
 
   lint:
     name: Lint
@@ -32,10 +32,10 @@ jobs:
         uses: actions/checkout@v4
 
       - name: setup
-        uses: ./.github/actions/pr-setup
+        uses: ./.github/actions/setup
 
-      - name: Lint passport examples
-        run: yarn lint:examples:passport
+      - name: Lint examples
+        run: yarn lint:examples
 
   test:
     name: Test
@@ -47,7 +47,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: setup
-        uses: ./.github/actions/pr-setup
+        uses: ./.github/actions/setup
 
-      - name: Test passport examples
-        run: yarn test:examples:passport
+      - name: Test examples
+        run: yarn test:examples