Revert "Next swc publish flow (vercel#27932)"

This reverts commit 94fc6f0.

.github/workflows/build_native.yml

@@ -1,82 +1,154 @@
-on: workflow_dispatch
+on:
+  workflow_dispatch:
+  pull_request:
+    types: [opened, synchronize]
+    paths:
+      - 'packages/next/build/swc/**'
 
 name: Build next-swc native binaries
 
 jobs:
-  build-native:
+  build:
     strategy:
       matrix:
         os: [ubuntu-18.04, macos-latest, windows-latest]
-        description: [default]
-        include:
-          - os: ubuntu-18.04
-            target: x86_64-unknown-linux-gnu
-          - os: windows-latest
-            target: x86_64-pc-windows-msvc
-          - os: macos-latest
-            target: x86_64-apple-darwin
-          - os: macos-latest
-            target: aarch64-apple-darwin
-            description: m1
-
-    name: next-swc - ${{ matrix.os }} - ${{ matrix.target }} - node@14
+
+    name: stable - ${{ matrix.os }} - node@14
     runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v2
+
       - name: Setup node
         uses: actions/setup-node@v2
         with:
           node-version: 14
           check-latest: true
+
       - name: Install
         uses: actions-rs/toolchain@v1
         with:
+          toolchain: stable
           profile: minimal
-          toolchain: nightly-2021-03-25
-          target: ${{ matrix.target }}
+
       - name: Cache cargo registry
         uses: actions/cache@v1
         with:
           path: ~/.cargo/registry
           key: stable-${{ matrix.os }}-node@14-cargo-registry-trimmed-${{ hashFiles('**/Cargo.lock') }}
+
       - name: Cache cargo index
         uses: actions/cache@v1
         with:
           path: ~/.cargo/git
           key: stable-${{ matrix.os }}-node@14-cargo-index-trimmed-${{ hashFiles('**/Cargo.lock') }}
-      - name: Cache native binary
-        id: binary-cache
-        uses: actions/cache@v2
+
+      - name: Cache NPM dependencies
+        uses: actions/cache@v1
         with:
-          path: packages/next/native/**
-          key: next-swc-nightly-2021-03-25-${{ matrix.target }}-${{ hashFiles('packages/next/build/swc/**') }}
+          path: node_modules
+          key: npm-cache-${{ matrix.os }}-node@14-${{ hashFiles('yarn.lock') }}
+
+      - name: 'Install dependencies'
+        run: yarn install --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
+
       - name: 'Build'
-        if: steps.binary-cache.outputs.cache-hit != true
-        run: yarn build-native --target ${{ matrix.target }}
+        run: yarn --cwd packages/next build-native
         env:
           MACOSX_DEPLOYMENT_TARGET: '10.13'
-        working-directory: packages/next
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: next-swc-binaries
+          path: packages/next/native
+
+      - name: Clear the cargo caches
+        run: |
+          cargo install cargo-cache --no-default-features --features ci-autoclean
+          cargo-cache
+
+  build-apple-silicon:
+    name: stable - aarch64-apple-darwin - node@14
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 14
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          override: true
+          toolchain: nightly-2021-03-25
+          target: aarch64-apple-darwin
+
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile --registry https://registry.npmjs.org --network-timeout 300000
+
+      - name: Cross build aarch64
+        run: yarn --cwd packages/next build-native --target aarch64-apple-darwin
+
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
           name: next-swc-binaries
-          path: packages/next/native/next-swc.*.node
+          path: packages/next/native
+
       - name: Clear the cargo caches
         run: |
           cargo install cargo-cache --no-default-features --features ci-autoclean
           cargo-cache
+
   commit:
-    needs: build-native
+    needs: [build, build-apple-silicon]
     runs-on: ubuntu-18.04
 
     steps:
       - uses: actions/checkout@v2
+        if: ${{ github.event_name  == 'workflow_dispatch' }}
       - uses: actions/download-artifact@v2
         with:
           name: next-swc-binaries
           path: packages/next/native
+        if: ${{ github.event_name  == 'workflow_dispatch' }}
       - uses: EndBug/add-and-commit@v7
         with:
           add: 'packages/next/native --force'
           message: 'Build next-swc binaries'
+        if: ${{ github.event_name  == 'workflow_dispatch' }}
+
+  check:
+    needs: [build, build-apple-silicon]
+    runs-on: ubuntu-18.04
+
+    steps:
+      - uses: actions/checkout@v2
+        if: ${{ github.event_name  == 'pull_request' }}
+      - uses: actions/download-artifact@v2
+        with:
+          name: next-swc-binaries
+          path: packages/next/native
+        if: ${{ github.event_name  == 'pull_request' }}
+      - run: git diff --exit-code
+        if: ${{ github.event_name  == 'pull_request' }}
+
+  test:
+    runs-on: ubuntu-18.04
+
+    steps:
+      - uses: actions/checkout@v2
+        if: ${{ github.event_name  == 'pull_request' }}
+      - name: Install
+        if: ${{ github.event_name  == 'pull_request' }}
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly-2021-03-25
+          profile: minimal
+      - run: cd packages/next/build/swc && cargo test
+        if: ${{ github.event_name  == 'pull_request' }}

.github/workflows/build_test_deploy.yml

@@ -1,7 +1,6 @@
 on:
   push:
     branches: [canary]
-    tags: [v*]
   pull_request:
     types: [opened, synchronize]
 
@@ -47,7 +46,7 @@ jobs:
   checkPrecompiled:
     name: Check Pre-compiled
     runs-on: ubuntu-latest
-    needs: [build, build-native]
+    needs: build
     env:
       NEXT_TELEMETRY_DISABLED: 1
     steps:
@@ -57,10 +56,6 @@ jobs:
         with:
           path: ./*
           key: ${{ github.sha }}
-      - uses: actions/download-artifact@v2
-        with:
-          name: next-swc-binaries
-          path: packages/next/native
       - run: ./scripts/check-pre-compiled.sh
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
 
@@ -245,10 +240,9 @@ jobs:
         if: ${{needs.build.outputs.docsChange != 'docs only change'}}
 
   publishRelease:
-    if: ${{ startsWith(github.ref, 'refs/tags/v') }}
     name: Potentially publish release
     runs-on: ubuntu-latest
-    needs: [build, build-native]
+    needs: build
     env:
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
     steps:
@@ -257,11 +251,7 @@ jobs:
         with:
           path: ./*
           key: ${{ github.sha }}
-      - uses: actions/download-artifact@v2
-        with:
-          name: next-swc-binaries
-          path: packages/next/native
-      - run: ./scripts/prepublish-native.js
+
       - run: ./scripts/publish-release.sh
 
   releaseStats:
@@ -278,80 +268,3 @@ jobs:
       - uses: ./.github/actions/next-stats-action
         env:
           PR_STATS_COMMENT_TOKEN: ${{ secrets.PR_STATS_COMMENT_TOKEN }}
-
-  build-native:
-    strategy:
-      matrix:
-        os: [ubuntu-18.04, macos-latest, windows-latest]
-        description: [default]
-        include:
-          - os: ubuntu-18.04
-            target: x86_64-unknown-linux-gnu
-          - os: windows-latest
-            target: x86_64-pc-windows-msvc
-          - os: macos-latest
-            target: x86_64-apple-darwin
-          - os: macos-latest
-            target: aarch64-apple-darwin
-            description: m1
-
-    name: next-swc - ${{ matrix.os }} - ${{ matrix.target }} - node@14
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 14
-          check-latest: true
-      - name: Install
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly-2021-03-25
-          target: ${{ matrix.target }}
-      - name: Cache cargo registry
-        uses: actions/cache@v1
-        with:
-          path: ~/.cargo/registry
-          key: stable-${{ matrix.os }}-node@14-cargo-registry-trimmed-${{ hashFiles('**/Cargo.lock') }}
-      - name: Cache cargo index
-        uses: actions/cache@v1
-        with:
-          path: ~/.cargo/git
-          key: stable-${{ matrix.os }}-node@14-cargo-index-trimmed-${{ hashFiles('**/Cargo.lock') }}
-      - name: Cache native binary
-        id: binary-cache
-        uses: actions/cache@v2
-        with:
-          path: packages/next/native/**
-          key: next-swc-nightly-2021-03-25-${{ matrix.target }}-${{ hashFiles('packages/next/build/swc/**') }}
-      - name: 'Build'
-        if: steps.binary-cache.outputs.cache-hit != true
-        run: yarn build-native --target ${{ matrix.target }}
-        env:
-          MACOSX_DEPLOYMENT_TARGET: '10.13'
-        working-directory: packages/next
-      - name: Upload artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: next-swc-binaries
-          path: packages/next/native/next-swc.*.node
-      - name: Clear the cargo caches
-        run: |
-          cargo install cargo-cache --no-default-features --features ci-autoclean
-          cargo-cache
-
-  test-native:
-    name: Unit Test Native Code
-    runs-on: ubuntu-18.04
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly-2021-03-25
-          profile: minimal
-      - run: cd packages/next/build/swc && cargo test