Fix build system in CICD to match the new build system locally

Stop publishing our flextesa image on every PR and just use the one that ECAD devs use when building locally
TezosTaqueria · Nov 26, 2022 · 4c4c5f1 · 4c4c5f1
1 parent fb130b0
commit 4c4c5f1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,9 +18,6 @@ concurrency:
   group: ${{ github.ref_name || github.ref }}
   cancel-in-progress: true
 
-env:
-  TAQ_VERSION: ${{ github.ref_name }}
-
 jobs:
   # When we use reusable we lose the ability to to filter out the workflow for changes to certain paths.
   # This job creates boolean outputs based on path filters. These outputs can then be used as job conditions
@@ -89,6 +86,12 @@ jobs:
       - name: Setup repo
         uses: actions/checkout@v3
 
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: lts/gallium
+          cache: "npm"
+
       - name: Setup Deno
         uses: denoland/setup-deno@v1
         with:
@@ -102,9 +105,7 @@ jobs:
         env:
           DENO_DIR: "./deno"
         run: |
-          BUILD=`git rev-parse --short "$GITHUB_SHA"`
-          TAQ_VERSION="${TAQ_VERSION/\//-}"
-          deno compile --output taq --allow-run --allow-write --allow-read --allow-env --allow-net --import-map ./import_map.json --no-prompt --target $DENO_TARGET index.ts --setBuild "$BUILD" --setVersion "$TAQ_VERSION" --lock ./deno-lock.json
+          npm run build:binary
           ./"${{ matrix.taqueria_bin }}" init -p ./test_project
           if [ ! -f ./test_project/.taq/config.json ]; then
             echo "Project not initialized"
@@ -213,11 +214,9 @@ jobs:
 
       - name: Build all
         run: |
-          BUILD=`git rev-parse --short "$GITHUB_SHA"`
-          TAQ_VERSION="${TAQ_VERSION/\//-}"
           npx lerna bootstrap 
           npm run build:packages 
-          deno compile --output taq --allow-run --allow-write --allow-read --allow-env --allow-net --import-map ./import_map.json --no-prompt index.ts --setBuild "$BUILD" --setVersion "$TAQ_VERSION" --lock ./deno-lock.json
+          npm run build:binary
           npm run build:docker
 
       - name: Run unit tests
@@ -277,11 +276,9 @@ jobs:
 
       - name: Build all
         run: |
-          BUILD=`git rev-parse --short "$GITHUB_SHA"`
-          TAQ_VERSION="${TAQ_VERSION/\//-}"
           npx lerna bootstrap 
           npm run build:packages 
-          deno compile --output taq --allow-run --allow-write --allow-read --allow-env --allow-net --import-map ./import_map.json --no-prompt index.ts --quickstart "`cat quickstart.md`" --setBuild "$BUILD" --setVersion "$TAQ_VERSION" --lock ./deno-lock.json
+          npm run build:binary
           npm run build:docker
 
       - name: Publish for PR

diff --git a/bin/build-all.sh b/bin/build-all.sh
@@ -19,13 +19,13 @@ if [ "$0" == "./bin/build-all.sh" ] && [ -f index.ts ]; then
 
     echo ""
     echo '**********************************************'
-    echo "** Building taqueria"
-    npm run build:binary
+    echo "** Building packages"
+    npm run build:packages
 
     echo ""
     echo '**********************************************'
-    echo "** Building packages"
-    npm run build:packages
+    echo "** Building taqueria"
+    npm run build:binary
 
     echo ""
     echo '**********************************************'