Updated release workflow

couchbase-partners · Sep 8, 2021 · ca60969 · ca60969
1 parent 881fc46
commit ca60969
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 6 deletions.
diff --git a/.github/workflows/Azure-CreateRelease.yml b/.github/workflows/Azure-CreateRelease.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Create Build Directory
         run: mkdir ${GITHUB_WORKSPACE}/build
       # Runs a set of commands using the runners shell
-      - name: Build BYOL CBS Package
+      - name: Build BYOL Combined Package
         run: |
           bash ${GITHUB_WORKSPACE}/azure/CouchbaseServerAndSyncGateway-Application/makeArchives.sh \
                                           -l byol \
@@ -35,7 +35,7 @@ jobs:
                                           -g couchbase-sync-gateway-enterprise \
                                           -i 18.4.0 \
                                           -u byol_2019
-      - name: Build Hourly CBS Package
+      - name: Build Hourly Combined Package
         run: |
           bash ${GITHUB_WORKSPACE}/azure/CouchbaseServerAndSyncGateway-Application/makeArchives.sh \
                                         -l hourly-pricing \
@@ -46,14 +46,66 @@ jobs:
                                         -g couchbase-sync-gateway-enterprise \
                                         -i 18.4.0 \
                                         -u hourly_pricing_mar19
+      - name: Build BYOL CBS Package
+        run: |
+          bash ${GITHUB_WORKSPACE}/azure/CouchbaseServer-Application/makeArchives.sh \
+                                          -l byol \
+                                          -s byol_2019 \
+                                          -p couchbase \
+                                          -o couchbase-server-enterprise \
+                                          -v 18.4.0
+      - name: Build Hourly CBS Package
+        run: |
+          bash ${GITHUB_WORKSPACE}/azure/CouchbaseServer-Application/makeArchives.sh \
+                                        -l hourly-pricing \
+                                        -s hourly_pricing_mar19 \
+                                        -p couchbase \
+                                        -o couchbase-server-enterprise \
+                                        -v 18.4.0                                        
+      - name: Build BYOL Gateway Package
+        run: |
+          bash ${GITHUB_WORKSPACE}/azure/CouchbaseSyncGateway-Application/makeArchives.sh \
+                                          -l byol \
+                                          -p couchbase \
+                                          -g couchbase-sync-gateway-enterprise \
+                                          -i 18.4.0 \
+                                          -u byol_2019
+      - name: Build Hourly Gateway Package
+        run: |
+          bash ${GITHUB_WORKSPACE}/azure/CouchbaseSyncGateway-Application/makeArchives.sh \
+                                        -l hourly-pricing \
+                                        -p couchbase \
+                                        -g couchbase-sync-gateway-enterprise \
+                                        -i 18.4.0 \
+                                        -u hourly_pricing_mar19                                        
+      - name: Upload Combined BYOL Package
+        id: upload-combined-byol-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with: 
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ./build/azure/CouchBaseServerAndSyncGateway/azure-combined-archive-byol.zip
+          asset_name: azure-combined-archive-byol.zip
+          asset_content_type: application/zip
+      - name: Upload Combined Hourly Package
+        id: upload-combined-hourly-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with: 
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ./build/azure/CouchBaseServerAndSyncGateway/azure-combined-archive-hourly-pricing.zip
+          asset_name: azure-combined-archive-hourly-pricing.zip
+          asset_content_type: application/zip
       - name: Upload CBS BYOL Package
         id: upload-cbs-byol-asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with: 
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ./build/azure/CouchBaseServerAndSyncGateway/azure-cbs-archive-byol.zip
+          asset_path: ./build/azure/CouchBaseServer/azure-cbs-archive-byol.zip
           asset_name: azure-cbs-archive-byol.zip
           asset_content_type: application/zip
       - name: Upload CBS Hourly Package
@@ -63,6 +115,26 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with: 
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ./build/azure/CouchBaseServerAndSyncGateway/azure-cbs-archive-hourly-pricing.zip
+          asset_path: ./build/azure/CouchBaseServer/azure-cbs-archive-hourly-pricing.zip
           asset_name: azure-cbs-archive-hourly-pricing.zip
-          asset_content_type: application/zip
+          asset_content_type: application/zip
+      - name: Upload Gateway BYOL Package
+        id: upload-sg-byol-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with: 
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ./build/azure/CouchBaseSyncGateway/azure-sg-archive-byol.zip
+          asset_name: azure-sg-archive-byol.zip
+          asset_content_type: application/zip
+      - name: Upload Gateway Hourly Package
+        id: upload-sg-hourly-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with: 
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: ./build/azure/CouchBaseSyncGateway/azure-sg-archive-hourly-pricing.zip
+          asset_name: azure-sg-archive-hourly-pricing.zip
+          asset_content_type: application/zip                    
diff --git a/azure/CouchbaseServerAndSyncGateway-Application/makeArchives.sh b/azure/CouchbaseServerAndSyncGateway-Application/makeArchives.sh
@@ -64,7 +64,7 @@ function makeArchive()
   curl -L "$SCRIPT_URL" -o "$dir../../build/tmp/couchbase_installer.sh"
 
   cd "$dir../../build/tmp" || exit
-  zip -r -j -X "$dir../../build/azure/CouchBaseServerAndSyncGateway/azure-cbs-archive-${license}.zip" *
+  zip -r -j -X "$dir../../build/azure/CouchBaseServerAndSyncGateway/azure-combined-archive-${license}.zip" *
   cd - || exit
   rm -rf "$dir../../build/tmp"
 }