GitHub workflow attempt #3

dannymcgee · May 10, 2024 · 4a323e8 · 4a323e8
1 parent 29eb67e
commit 4a323e8
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 48 deletions.
diff --git a/.github/actions/setup-node/action.yml b/.github/actions/setup-node/action.yml
@@ -0,0 +1,20 @@
+name: Setup Node
+runs:
+  using: composite
+  steps:
+    - uses: actions/setup-node@v4
+      with:
+        node-version: 20
+        cache: npm
+    - uses: actions/cache@v4
+      with:
+        path: node_modules/
+        key: ${{ runner.os }}-setup-node-${{ hashFiles('**/package.json', '**/package-lock.json') }}
+    - name: Install node dependencies
+      run: npm ci
+    - name: Ensure unambiguous `main`
+      if: github.ref != 'refs/heads/main'
+      run: |
+        git remote set-branches origin main
+        git fetch --depth 1 origin main
+        git branch main origin/main
diff --git a/.github/actions/setup-rust/action.yml b/.github/actions/setup-rust/action.yml
@@ -0,0 +1,23 @@
+name: Setup Rust
+runs:
+  using: composite
+  steps:
+    - uses: dtolnay/rust-toolchain@stable
+      with:
+        components: clippy
+    - uses: dtolnay/rust-toolchain@nightly
+      with:
+        components: rustfmt
+    - uses: actions/cache@v4
+      with:
+        path: |
+          ~/.cargo/bin/
+          ~/.cargo/registry/index/
+          ~/.cargo/registry/cache/
+          ~/.cargo/git/db/
+          target/
+        key: ${{ runner.os }}-setup-rust-${{ hashFiles('**/Cargo.toml') }}
+    - name: Set default Rust toolchain
+      run: rustup default stable
+    - name: Verify Rust setup
+      run: rustup show
diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml
@@ -16,59 +16,58 @@ jobs:
   #         git fetch --depth 1 origin main
   #         git branch main origin/main
 
-  setup-rust:
-    runs-on: ubuntu-latest
-    # needs: checkout-repo
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          components: clippy
-      - uses: dtolnay/rust-toolchain@nightly
-        with:
-          components: rustfmt
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-setup-rust-${{ hashFiles('**/Cargo.toml') }}
-      - name: Set default Rust toolchain
-        run: rustup default stable
-      - name: Verify Rust setup
-        run: rustup show
+  # setup-rust:
+  #   runs-on: ubuntu-latest
+  #   # needs: checkout-repo
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: dtolnay/rust-toolchain@stable
+  #       with:
+  #         components: clippy
+  #     - uses: dtolnay/rust-toolchain@nightly
+  #       with:
+  #         components: rustfmt
+  #     - uses: actions/cache@v4
+  #       with:
+  #         path: |
+  #           ~/.cargo/bin/
+  #           ~/.cargo/registry/index/
+  #           ~/.cargo/registry/cache/
+  #           ~/.cargo/git/db/
+  #           target/
+  #         key: ${{ runner.os }}-setup-rust-${{ hashFiles('**/Cargo.toml') }}
+  #     - name: Set default Rust toolchain
+  #       run: rustup default stable
+  #     - name: Verify Rust setup
+  #       run: rustup show
 
-  setup-node:
-    runs-on: ubuntu-latest
-    # needs: checkout-repo
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: npm
-      - uses: actions/cache@v4
-        with:
-          path: node_modules/
-          key: ${{ runner.os }}-setup-node-${{ hashFiles('**/package.json', '**/package-lock.json') }}
-      - name: Install node dependencies
-        run: npm ci
+  # setup-node:
+  #   runs-on: ubuntu-latest
+  #   # needs: checkout-repo
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: actions/setup-node@v4
+  #       with:
+  #         node-version: 20
+  #         cache: npm
+  #     - uses: actions/cache@v4
+  #       with:
+  #         path: node_modules/
+  #         key: ${{ runner.os }}-setup-node-${{ hashFiles('**/package.json', '**/package-lock.json') }}
+  #     - name: Install node dependencies
+  #       run: npm ci
 
   validate-affected:
     runs-on: ubuntu-latest
-    needs:
-      - setup-rust
-      - setup-node
     steps:
       - uses: actions/checkout@v4
-      - name: Ensure unambiguous `main`
-        if: github.ref != 'refs/heads/main'
-        run: |
-          git remote set-branches origin main
-          git fetch --depth 1 origin main
-          git branch main origin/main
+      - uses: ./.github/actions/setup-rust
+      - uses: ./.github/actions/setup-node
+      # - name: Ensure unambiguous `main`
+      #   if: github.ref != 'refs/heads/main'
+      #   run: |
+      #     git remote set-branches origin main
+      #     git fetch --depth 1 origin main
+      #     git branch main origin/main
       - name: nx affected
         run: npx nx affected -t format lint test --configuration ci