Merge pull request #28 from malscent/main

Fixes for naming templates during build
couchbase-partners · Mar 24, 2021 · 222251e · 222251e
2 parents d384c60 + 02d5235
commit 222251e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/AWS-CreateRelease.yml b/.github/workflows/AWS-CreateRelease.yml
@@ -34,7 +34,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with: 
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: $GITHUB_WORKSPACE/build/aws/CouchbaseServerAndSyncGateway/aws-cbs-byol.template
+          asset_path: ./build/aws/CouchbaseServerAndSyncGateway/aws-cbs-byol.template
           asset_name: aws-cbs-byol.template
           asset_content_type: application/json
       - name: Upload CBS Hourly Package
@@ -44,7 +44,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with: 
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: $GITHUB_WORKSPACE/build/aws/CouchbaseServerAndSyncGateway/aws-cbs-hourly-pricing.template
+          asset_path: ./build/aws/CouchbaseServerAndSyncGateway/aws-cbs-hourly-pricing.template
           asset_name: aws-cbs-hourly-pricing.template
           asset_content_type: application/json
       - name: Upload SG BYOL Package
@@ -54,7 +54,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with: 
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: $GITHUB_WORKSPACE/build/aws/CouchbaseSyncGateway/aws-sg-byol.template
+          asset_path: ./build/aws/CouchbaseSyncGateway/aws-sg-byol.template
           asset_name: aws-sg-byol.template
           asset_content_type: application/json
       - name: Upload SG Hourly Package
@@ -64,7 +64,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with: 
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: $GITHUB_WORKSPACE/build/aws/CouchbaseSyncGateway/aws-sg-hourly-pricing.template
+          asset_path: ./build/aws/CouchbaseSyncGateway/aws-sg-hourly-pricing.template
           asset_name: aws-sg-hourly-pricing.template
           asset_content_type: application/json
 
diff --git a/aws/CouchbaseServerAndSyncGateway/makeArchives.sh b/aws/CouchbaseServerAndSyncGateway/makeArchives.sh
@@ -5,5 +5,5 @@ mkdir -p "$SCRIPT_SOURCE../../build/aws/CouchbaseServerAndSyncGateway/"
 # First we need to replace the URL to the install script based on the root script_url txt
 bash "$SCRIPT_SOURCE../../script_url_replacer.sh" "${SCRIPT_SOURCE}embedded_gateway.sh"
 bash "$SCRIPT_SOURCE../../script_url_replacer.sh" "${SCRIPT_SOURCE}embedded_server.sh"
-node "${SCRIPT_SOURCE}compiler.js" "${SCRIPT_SOURCE}mappings.byol.json" > "$SCRIPT_SOURCE../../build/aws/CouchbaseServerAndSyncGateway/couchbase-byol-amzn-lnx2.template"
-node "${SCRIPT_SOURCE}compiler.js" "${SCRIPT_SOURCE}mappings.hourly.json" > "$SCRIPT_SOURCE../../build/aws/CouchbaseServerAndSyncGateway/couchbase-hourlypricing-amzn-lnx2.template"
+node "${SCRIPT_SOURCE}compiler.js" "${SCRIPT_SOURCE}mappings.byol.json" > "$SCRIPT_SOURCE../../build/aws/CouchbaseServerAndSyncGateway/aws-cbs-byol.template"
+node "${SCRIPT_SOURCE}compiler.js" "${SCRIPT_SOURCE}mappings.hourly.json" > "$SCRIPT_SOURCE../../build/aws/CouchbaseServerAndSyncGateway/aws-cbs-hourly-pricing.template"