Merge pull request #199 from Chia-Network/artifact-uploads-better

ci: artifact upload logic improvement
Chia-Network · Dec 17, 2024 · 99313d9 · 99313d9
2 parents eff0177 + 870080c
commit 99313d9
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml
@@ -78,11 +78,11 @@ jobs:
           - name: default
             cadt-api-server-host: 'https://observer.climateactiondata.org/api'
             cadt-ui-host: 'https://observer.climateactiondata.org'
-            token-driver-filename-string: ''
+            filename-string: ''
           - name: testneta
             cadt-api-server-host: 'https://chia-cadt-demo.chiamanaged.com/observer'
             cadt-ui-host: 'https://chia-cadt-demo.chiamanaged.com/'
-            token-driver-filename-string: '-testneta'
+            filename-string: '-testneta'
         exclude:
           - os:
               matrix: windows
@@ -122,7 +122,7 @@ jobs:
 
           echo "Token Driver version to download: ${token_driver_version}"
           mkdir -p downloaded-artifacts
-          curl -L -o downloaded-artifacts/climate-token-driver${{ matrix.preconfiguration.token-driver-filename-string }}_${{ matrix.os.matrix}}_${token_driver_version}_${{ matrix.arch.artifact-name }}.zip https://github.com/Chia-Network/climate-token-driver/releases/download/${token_driver_version}/climate-token-driver${{ matrix.preconfiguration.token-driver-filename-string }}_${{ matrix.os.matrix}}_${token_driver_version}_${{ matrix.arch.artifact-name }}.zip
+          curl -L -o downloaded-artifacts/climate-token-driver${{ matrix.preconfiguration.filename-string }}_${{ matrix.os.matrix}}_${token_driver_version}_${{ matrix.arch.artifact-name }}.zip https://github.com/Chia-Network/climate-token-driver/releases/download/${token_driver_version}/climate-token-driver${{ matrix.preconfiguration.filename-string }}_${{ matrix.os.matrix}}_${token_driver_version}_${{ matrix.arch.artifact-name }}.zip
           pushd downloaded-artifacts
           unzip *.zip
           rm -f *.zip
@@ -288,16 +288,8 @@ jobs:
       - name: Upload installer to artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.os.artifact-name }}-${{ matrix.arch.artifact-name}}-installer
+          name: ${{ matrix.os.artifact-name }}-${{ matrix.arch.artifact-name}}${{ matrix.preconfiguration.filename-string }}-installer
           path: 'artifacts/*'
-        if: matrix.preconfiguration.name == 'default'
-
-      - name: Upload custom installers to artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.os.artifact-name }}-${{ matrix.arch.artifact-name}}-${{ matrix.preconfiguration.name }}-installer
-          path: 'artifacts/*'
-        if: matrix.preconfiguration.name != 'default'
 
       # We want to delete this no matter what happened in the previous steps (failures, success, etc)
       - name: Delete signing keychain