Workflow change

CodingTil · Mar 16, 2024 · f6cd03e · f6cd03e
1 parent 3690a66
commit f6cd03e
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 48 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -1,30 +1,8 @@
-on:
-  workflow_run:
-    workflows: ["Tailwind"]
-    types:
-      - completed
+on: push
 
 name: Build and test
 
 jobs:
-  build_and_test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Add wasm32 target
-        run: rustup target add wasm32-unknown-unknown
-      - name: Install Trunk
-        run: cargo install --locked trunk
-      - name: Clean
-        run: cargo clean
-      - name: Download CSS artifact
-        uses: actions/download-artifact@v2
-        with:
-          name: tailwind-css
-          path: style/
-      - name: Build
-        run: trunk build --release --verbose
-
   clippy:
     runs-on: ubuntu-latest
     steps:
@@ -37,4 +15,42 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Format
-        run: cargo fmt --all -- --check
+        run: cargo fmt --all -- --check
+
+  tailwind-build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: '14'
+      - name: Install Tailwind
+        run: npm install -D tailwindcss
+      - name: Install Dependencies
+        run: npm install @tailwindcss/typography @tailwindcss/forms @tailwindcss/aspect-ratio
+      - name: Build
+        run: npx tailwind -o style/main.css
+      - name: Upload Style Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: tailwind-style
+          path: style/main.css
+
+  build_and_test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Add wasm32 target
+        run: rustup target add wasm32-unknown-unknown
+      - name: Install Trunk
+        run: cargo install --locked trunk
+      - name: Clean
+        run: cargo clean
+      - name: Upload Style Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: tailwind-style
+          path: style/main.css
+      - name: Build
+        run: trunk build --release --verbose
diff --git a/.github/workflows/tailwind.yml b/.github/workflows/tailwind.yml