Fix workflows

[release]
cxmeel · Aug 11, 2021 · 7dc87e0 · 7dc87e0
1 parent 5541dca
commit 7dc87e0
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -46,9 +46,9 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Get Project Name
+      - name: Set Project Name
         run: |
-          PROJECT_NAME=`grep -Po '(?<=^name = ")([^"]+)' wally.toml`
+          PROJECT_NAME="colour-utils"
           echo "PROJECT_NAME=$PROJECT_NAME" >> $GITHUB_ENV
 
       - name: Get Current Version
@@ -78,6 +78,3 @@ jobs:
           draft: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Upload to Roblox
-        run: rojo upload default.project.json --asset_id 6573728888 --cookie ${{ secrets.ROBLOSECURITY }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -1,4 +1,4 @@
-name: Publish to NPM
+name: Publish Release
 
 on:
   release:
@@ -8,12 +8,39 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Setup Node 14.x
+        uses: actions/setup-node@v1
         with:
           node-version: 14
-      - run: npm i -g roblox-ts
-      - run: npm i
-      - uses: JS-DevTools/npm-publish@v1
+
+      - name: Install Roblox-TS
+        run: |
+          npm i -g roblox-ts
+          npm i
+
+      - name: Setup Toolchain
+        uses: Roblox/setup-foreman@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Set Project Name
+        run: |
+          PROJECT_NAME="colour-utils"
+          echo "PROJECT_NAME=$PROJECT_NAME" >> $GITHUB_ENV
+
+      - name: Build Project
+        run: |
+          rojo build default.project.json -o dist/${{ env.PROJECT_NAME }}.rbxm
+
+      - name: Publish to NPM
+        uses: JS-DevTools/npm-publish@v1
         with:
           token: ${{ secrets.NPM_TOKEN }}
+
+      - name: Upload to Roblox
+        run: rojo upload default.project.json --asset_id 6573728888 --cookie ${{ secrets.ROBLOSECURITY }}