Release 2.7.0

pozil · pozil · commit 989de1b7cf4b · 2021-11-02T21:23:32.000+01:00
diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml
@@ -54,12 +54,13 @@ jobs:
         needs: formatting-and-lwc-tests
         steps:
             # Install Salesforce CLI
-            - name: Install Salesforce CLI
+            - name: 'Install Salesforce CLI'
               run: |
-                  wget https://developer.salesforce.com/media/salesforce-cli/sfdx-linux-amd64.tar.xz
-                  mkdir sfdx-cli
-                  tar xJf sfdx-linux-amd64.tar.xz -C sfdx-cli --strip-components 1
-                  ./sfdx-cli/install
+                  wget https://developer.salesforce.com/media/salesforce-cli/sfdx/channels/stable/sfdx-linux-x64.tar.xz
+                  mkdir ~/sfdx
+                  tar xJf sfdx-linux-x64.tar.xz -C ~/sfdx --strip-components 1
+                  echo "$HOME/sfdx/bin" >> $GITHUB_PATH
+                  ~/sfdx/bin/sfdx version
 
             # Checkout the code in the pull request
             - name: 'Checkout source code'
@@ -68,7 +69,13 @@ jobs:
             # Store secret for dev hub
             - name: 'Populate auth file with DEVHUB_SFDX_URL secret'
               shell: bash
-              run: 'echo ${{ secrets.DEVHUB_SFDX_URL}} > ./DEVHUB_SFDX_URL.txt'
+              run: |
+                  echo ${{ secrets.DEVHUB_SFDX_URL}} > ./DEVHUB_SFDX_URL.txt
+                  secretFileSize=$(wc -c "./DEVHUB_SFDX_URL.txt" | awk '{print $1}')
+                  if [ $secretFileSize == 1 ]; then
+                      echo "Missing DEVHUB_SFDX_URL secret. Is this workflow running on a fork?";
+                      exit 1;
+                  fi
 
             # Authenticate dev hub
             - name: 'Authenticate Dev Hub'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -58,12 +58,13 @@ jobs:
         needs: formatting-and-lwc-tests
         steps:
             # Install Salesforce CLI
-            - name: Install Salesforce CLI
+            - name: 'Install Salesforce CLI'
               run: |
-                  wget https://developer.salesforce.com/media/salesforce-cli/sfdx-linux-amd64.tar.xz
-                  mkdir sfdx-cli
-                  tar xJf sfdx-linux-amd64.tar.xz -C sfdx-cli --strip-components 1
-                  ./sfdx-cli/install
+                  wget https://developer.salesforce.com/media/salesforce-cli/sfdx/channels/stable/sfdx-linux-x64.tar.xz
+                  mkdir ~/sfdx
+                  tar xJf sfdx-linux-x64.tar.xz -C ~/sfdx --strip-components 1
+                  echo "$HOME/sfdx/bin" >> $GITHUB_PATH
+                  ~/sfdx/bin/sfdx version
 
             # Checkout the code in the pull request
             - name: 'Checkout source code'
diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
@@ -12,12 +12,13 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             # Install Salesforce CLI
-            - name: Install Salesforce CLI
+            - name: 'Install Salesforce CLI'
               run: |
-                  wget https://developer.salesforce.com/media/salesforce-cli/sfdx-linux-amd64.tar.xz
-                  mkdir sfdx-cli
-                  tar xJf sfdx-linux-amd64.tar.xz -C sfdx-cli --strip-components 1
-                  ./sfdx-cli/install
+                  wget https://developer.salesforce.com/media/salesforce-cli/sfdx/channels/stable/sfdx-linux-x64.tar.xz
+                  mkdir ~/sfdx
+                  tar xJf sfdx-linux-x64.tar.xz -C ~/sfdx --strip-components 1
+                  echo "$HOME/sfdx/bin" >> $GITHUB_PATH
+                  ~/sfdx/bin/sfdx version
 
             # Checkout the code in the pull request
             - name: 'Checkout source code'
@@ -26,7 +27,13 @@ jobs:
             # Store secret for dev hub
             - name: 'Populate auth file with DEVHUB_SFDX_URL secret'
               shell: bash
-              run: 'echo ${{ secrets.DEVHUB_SFDX_URL}} > ./DEVHUB_SFDX_URL.txt'
+              run: |
+                  echo ${{ secrets.DEVHUB_SFDX_URL}} > ./DEVHUB_SFDX_URL.txt
+                  secretFileSize=$(wc -c "./DEVHUB_SFDX_URL.txt" | awk '{print $1}')
+                  if [ $secretFileSize == 1 ]; then
+                      echo "Missing DEVHUB_SFDX_URL secret. Is this workflow running on a fork?";
+                      exit 1;
+                  fi
 
             # Authenticate dev hub
             - name: 'Authenticate Dev Hub'
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "sfdx-quiz",
-    "version": "2.6.1",
+    "version": "2.7.0",
     "private": true,
     "description": "Lightning Web Component Quiz App on a Salesforce Org",
     "scripts": {
diff --git a/sfdx-project.json b/sfdx-project.json
@@ -5,8 +5,8 @@
             "default": true,
             "package": "Quiz",
             "postInstallScript": "QuizPostInstallScript",
-            "versionName": "ver 2.6.1",
-            "versionNumber": "2.6.1.NEXT",
+            "versionName": "ver 2.7.0",
+            "versionNumber": "2.7.0.NEXT",
             "ancestorVersion": "2.6.0.2"
         }
     ],
diff --git a/src/main/default/lwc/gameApp/gameApp.js b/src/main/default/lwc/gameApp/gameApp.js
@@ -14,7 +14,7 @@ export default class GameApp extends LightningElement {
     isNextButtonDisabled = true;
     currentQuestion;
 
-    HOST_APP_VERSION = '2.6.1';
+    HOST_APP_VERSION = '2.7.0';
 
     @wire(getQuizSettings)
     wiredQuizSettings({ error, data }) {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "sfdx-quiz",`
`3`		`- "version": "2.6.1",`
	`3`	`+ "version": "2.7.0",`
`4`	`4`	`"private": true,`
`5`	`5`	`"description": "Lightning Web Component Quiz App on a Salesforce Org",`
`6`	`6`	`"scripts": {`