Workflow improvements (#9609)

* remove unnecessary download links GitHub already shows them in a table right below it. * detach `npm run style` from `npm run test` * decouple lint from test in workflows Which means that we don't need to do the crazy linking in certain workflows. * hoist the `CI` environment variable * create dedicated `lint` job The `lint` tests will run against source files and should not be dependant on a specific node version. Instead of running the `npm run style` on every node version we use, we can and should only run it once. * remove `prettier-plugin-tailwindcss` As long as we use older versions of node/npm where we can't have ourselves as a dependency, it is a bit of a mess to maintain properly sorted html in tests. Let's remove it for now until we have a better solution!
tailwindlabs · Oct 20, 2022 · 3c7fc69 · 3c7fc69
1 parent 40f6b4f
commit 3c7fc69
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 64 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -9,6 +9,9 @@ on:
 permissions:
   contents: read
 
+env:
+  CI: true
+
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -47,8 +50,6 @@ jobs:
       - name: Install dependencies
         # if: steps.cache-tailwindcss.outputs.cache-hit != 'true'
         run: npm install
-        env:
-          CI: true
 
       - name: Build Tailwind CSS
         run: npm run prepublishOnly
@@ -65,8 +66,6 @@ jobs:
       - name: Install shared dependencies
         if: steps.cache-integrations.outputs.cache-hit != 'true'
         run: npm run install:integrations
-        env:
-          CI: true
 
       - name: Test ${{ matrix.integration }}
         run: npm test --prefix ./integrations/${{ matrix.integration }}
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -12,6 +12,9 @@ on:
 permissions:
   contents: read
 
+env:
+  CI: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -40,17 +43,40 @@ jobs:
       - name: Install dependencies
         # if: steps.cache.outputs.cache-hit != 'true'
         run: npm install
-        env:
-          CI: true
 
       - name: Build Tailwind CSS
         run: npm run swcify
-        env:
-          CI: true
 
       - name: Test
-        run: |
-          ln -nfs `pwd` node_modules/tailwindcss # So that Prettier can use the local version
-          npm test
-        env:
-          CI: true
+        run: npm test
+
+  lint:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [16]
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+      #   cache: 'npm'
+      #
+      # - name: Use cached node_modules
+      #   id: cache
+      #   uses: actions/cache@v3
+      #   with:
+      #     path: node_modules
+      #     key: nodeModules-${{ hashFiles('**/package-lock.json') }}-${{ matrix.node-version }}
+      #     restore-keys: |
+      #       nodeModules-
+
+      - name: Install dependencies
+        # if: steps.cache.outputs.cache-hit != 'true'
+        run: npm install
+
+      - name: Lint
+        run: npm run style
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
@@ -68,13 +68,6 @@ jobs:
           tag_name: ${{ env.TAG_NAME }}
           body: |
             ${{ env.RELEASE_NOTES }}
-
-            * [Linux (arm64)](https://github.com/tailwindlabs/tailwindcss/releases/download/${{ env.TAG_NAME }}/tailwindcss-linux-arm64)
-            * [Linux (armv7)](https://github.com/tailwindlabs/tailwindcss/releases/download/${{ env.TAG_NAME }}/tailwindcss-linux-armv7)
-            * [Linux (x64)](https://github.com/tailwindlabs/tailwindcss/releases/download/${{ env.TAG_NAME }}/tailwindcss-linux-x64)
-            * [macOS (arm64)](https://github.com/tailwindlabs/tailwindcss/releases/download/${{ env.TAG_NAME }}/tailwindcss-macos-arm64)
-            * [macOS (x64)](https://github.com/tailwindlabs/tailwindcss/releases/download/${{ env.TAG_NAME }}/tailwindcss-macos-x64)
-            * [Windows (x64)](https://github.com/tailwindlabs/tailwindcss/releases/download/${{ env.TAG_NAME }}/tailwindcss-windows-x64.exe)
           files: |
             standalone-cli/dist/tailwindcss-linux-arm64
             standalone-cli/dist/tailwindcss-linux-armv7

diff --git a/.github/workflows/release-insiders.yml b/.github/workflows/release-insiders.yml
@@ -7,6 +7,9 @@ on:
 permissions:
   contents: read
 
+env:
+  CI: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -37,26 +40,12 @@ jobs:
       - name: Install dependencies
         # if: steps.cache.outputs.cache-hit != 'true'
         run: npm install
-        env:
-          CI: true
 
-      - name: Link and build Tailwind CSS
-        run: |
-          npm run swcify
-          ln -nfs `pwd` node_modules/tailwindcss
-        env:
-          CI: true
+      - name: Build Tailwind CSS
+        run: npm run swcify
 
       - name: Test
         run: npm test
-        env:
-          CI: true
-
-      - name: Unlink Tailwind CSS (for prettier)
-        run: |
-          unlink node_modules/tailwindcss
-        env:
-          CI: true
 
       - name: Resolve version
         id: vars
@@ -69,7 +58,6 @@ jobs:
       - name: Publish
         run: npm publish --tag insiders
         env:
-          CI: true
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: Trigger Tailwind Play update

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,6 +7,9 @@ on:
 permissions:
   contents: read
 
+env:
+  CI: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -37,13 +40,9 @@ jobs:
       - name: Install dependencies
         # if: steps.cache.outputs.cache-hit != 'true'
         run: npm install
-        env:
-          CI: true
 
       - name: Test
         run: npm test
-        env:
-          CI: true
 
       - name: Calculate environment variables
         run: |
@@ -53,7 +52,6 @@ jobs:
       - name: Publish
         run: npm publish --tag ${{ env.RELEASE_CHANNEL }}
         env:
-          CI: true
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: Trigger Tailwind Play update

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,7 +23,6 @@
     "test": "jest",
     "test:integrations": "npm run test --prefix ./integrations",
     "install:integrations": "node scripts/install-integrations.js",
-    "posttest": "npm run style",
     "generate:plugin-list": "node -r @swc/register scripts/create-plugin-list.js",
     "generate:types": "node -r @swc/register scripts/generate-types.js",
     "generate": "npm run generate:plugin-list && npm run generate:types",
@@ -57,7 +56,6 @@
     "jest": "^28.1.3",
     "jest-diff": "^28.1.3",
     "prettier": "^2.7.1",
-    "prettier-plugin-tailwindcss": "^0.1.13",
     "rimraf": "^3.0.0",
     "source-map-js": "^1.0.2"
   },