fix build tasks

tjwilson90 · Mar 1, 2020 · ae54a77 · ae54a77
1 parent 0a68617
commit ae54a77
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 18 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -10,14 +10,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Yarn install
-        run: yarn install
-        working-directory: packages/game
-
-      - name: Yarn build
-        run: yarn build:prod
-        working-directory: packages/game
-
       - name: Install musl
         run: sudo apt-get install musl-tools
 
@@ -27,6 +19,14 @@ jobs:
       - name: Cargo build
         run: cargo build --target x86_64-unknown-linux-musl --release --verbose
 
+      - name: Yarn install
+        run: yarn install
+        working-directory: packages/game
+
+      - name: Yarn build
+        run: yarn build
+        working-directory: packages/game
+
       - name: Make dist
         run: ./scripts/make-dist.sh
 

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -42,5 +42,5 @@ jobs:
         working-directory: packages/game
 
       - name: Yarn build
-        run: yarn build:prod
+        run: yarn build
         working-directory: packages/game
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,14 +11,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Yarn install
-        run: yarn install
-        working-directory: packages/game
-
-      - name: Yarn build
-        run: yarn build:prod
-        working-directory: packages/game
-
       - name: Install musl
         run: sudo apt-get install musl-tools
 
@@ -28,6 +20,14 @@ jobs:
       - name: Cargo build
         run: cargo build --target x86_64-unknown-linux-musl --release --verbose
 
+      - name: Yarn install
+        run: yarn install
+        working-directory: packages/game
+
+      - name: Yarn build
+        run: yarn build
+        working-directory: packages/game
+
       - name: Make dist
         run: ./scripts/make-dist.sh
 

diff --git a/scripts/make-dist.sh b/scripts/make-dist.sh
@@ -2,7 +2,6 @@
 
 mkdir -p turbo-hearts/assets/{auth,lobby,game}
 cp target/x86_64-unknown-linux-musl/release/turbo-hearts turbo-hearts
-cp packages/game/dist/* turbo-hearts/assets/game
 cp -r assets turbo-hearts
 tar czvf turbo-hearts.tgz turbo-hearts/
 rm -rf turbo-hearts