ci: recognise external downloads in installer (#7062)

* ci: recognise external downloads in installer * ci: zip artifacts only once * feat: add source to installManifest to select the right version * fix: missing space * fix: keep top folder in PR artifact Co-authored-by: Andreas Guther <[email protected]>
flybywiresim · May 9, 2022 · 388a0a4 · 388a0a4
1 parent cf8da73
commit 388a0a4
Show file tree

Hide file tree

Showing 8 changed files with 113 additions and 101 deletions.
diff --git a/.github/workflows/experimental.yml b/.github/workflows/experimental.yml
@@ -36,6 +36,8 @@ jobs:
         run: |
           ./scripts/dev-env/run.sh node ./scripts/fragment.js
 
+          cp ./build-modules/modules.json ./flybywire-aircraft-a320-neo/install.json
+          ./scripts/dev-env/run.sh node ./scripts/install-source.js
           mkdir ./${{ env.BUILD_DIR_NAME }}
           zip -r ./${{ env.BUILD_DIR_NAME }}/${{ env.EXPERIMENTAL_ZIP_NAME }} ./flybywire-aircraft-a320-neo/
       - name: Upload to Bunny CDN

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -38,6 +38,8 @@ jobs:
         run: |
           ./scripts/dev-env/run.sh node ./scripts/fragment.js
 
+          cp ./build-modules/modules.json ./flybywire-aircraft-a320-neo/install.json
+          ./scripts/dev-env/run.sh node ./scripts/install-source.js
           mkdir ./${{ env.BUILD_DIR_NAME }}
           zip -r ./${{ env.BUILD_DIR_NAME }}/${{ env.MASTER_ZIP_NAME }} ./flybywire-aircraft-a320-neo/
       - name: Get and delete vmaster pre-release zip asset

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -46,8 +46,6 @@ jobs:
     env:
       A32NX_PRODUCTION_BUILD: 1
       A32NX_INSTRUMENTS_BUILD_WORKERS: 2
-      ZIP_NAME: A32NX.zip
-      BUILD_DIR_NAME: zip-build
     steps:
       - name: Checkout source
         uses: actions/checkout@v2
@@ -62,11 +60,14 @@ jobs:
         run: |
           ./scripts/dev-env/run.sh ./scripts/setup.sh
           ./scripts/dev-env/run.sh ./scripts/build.sh --no-tty -j 4
-      - name: Generate ZIP file
+      - name: Generate install.json
         run: |
-          mkdir ./${{ env.BUILD_DIR_NAME }}
-          zip -r ./${{ env.BUILD_DIR_NAME }}/${{ env.ZIP_NAME }} ./flybywire-aircraft-a320-neo/
-      - uses: actions/upload-artifact@v2
+          ./scripts/dev-env/run.sh node ./scripts/fragment.js
+
+          cp ./build-modules/modules.json ./flybywire-aircraft-a320-neo/install.json
+          ./scripts/dev-env/run.sh node ./scripts/install-source.js
+      - name: Upload PR artifact
+        uses: actions/upload-artifact@v2
         with:
           name: A32NX
-          path: ${{ env.BUILD_DIR_NAME }}/${{ env.ZIP_NAME }}
+          path: ./**/flybywire-aircraft-a320-neo/
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -2,7 +2,7 @@ name: Pre release
 on:
   push:
     tags:
-      - 'v*-rc*'
+      - "v*-rc*"
 
 jobs:
   build:
@@ -28,6 +28,10 @@ jobs:
           ./scripts/dev-env/run.sh ./scripts/build.sh --no-tty -j 4
       - name: Build ZIP file
         run: |
+          ./scripts/dev-env/run.sh node ./scripts/fragment.js
+
+          cp ./build-modules/modules.json ./flybywire-aircraft-a320-neo/install.json
+          ./scripts/dev-env/run.sh node ./scripts/install-source.js
           mkdir ./${{ env.BUILD_DIR_NAME }}
           zip -r ./${{ env.BUILD_DIR_NAME }}/${{ env.RELEASE_ZIP_NAME }} ./flybywire-aircraft-a320-neo/
       - name: Create Release

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -33,6 +33,8 @@ jobs:
         run: |
           ./scripts/dev-env/run.sh node ./scripts/fragment.js
 
+          cp ./build-modules/modules.json ./flybywire-aircraft-a320-neo/install.json
+          ./scripts/dev-env/run.sh node ./scripts/install-source.js
           mkdir ./${{ env.BUILD_DIR_NAME }}
           zip -r ./${{ env.BUILD_DIR_NAME }}/${{ env.RELEASE_ZIP_NAME }} ./flybywire-aircraft-a320-neo/
       - name: Create Release

diff --git a/package-lock.json b/package-lock.json