Merge branch 'main' into patch-1

automation/properties/manual.properties.json

@@ -1,6 +1,6 @@
 {
     "name": "Manual workflow",
     "description": "Simple workflow that is manually triggered.",
-    "iconName": "blank",
+    "iconName": "octicon person",
     "categories": ["Automation"]
 }

ci/android.yml

@@ -17,5 +17,7 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
     - name: Build with Gradle
       run: ./gradlew build

ci/dotnet.yml

@@ -1,4 +1,4 @@
-name: .NET Core
+name: .NET
 
 on:
   push:
@@ -13,13 +13,13 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET Core
+    - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 3.1.301
-    - name: Install dependencies
+    - name: Restore dependencies
       run: dotnet restore
     - name: Build
-      run: dotnet build --configuration Release --no-restore
+      run: dotnet build --no-restore
     - name: Test
-      run: dotnet test --no-restore --verbosity normal
+      run: dotnet test --no-build --verbosity normal

ci/google.yml

@@ -8,7 +8,7 @@
 #
 # 3. Change the values for the GKE_ZONE, GKE_CLUSTER, IMAGE, and DEPLOYMENT_NAME environment variables (below).
 #
-# For more support on how to run the workflow, please visit https://github.com/GoogleCloudPlatform/github-actions/tree/master/example-workflows/gke
+# For more support on how to run the workflow, please visit https://github.com/google-github-actions/setup-gcloud/tree/master/example-workflows/gke
 
 name: Build and Deploy to GKE
 
@@ -33,7 +33,7 @@ jobs:
       uses: actions/checkout@v2
 
     # Setup gcloud CLI
-    - uses: GoogleCloudPlatform/github-actions/setup-gcloud@0.1.3
+    - uses: google-github-actions/setup-gcloud@v0.2.0
       with:
         service_account_key: ${{ secrets.GKE_SA_KEY }}
         project_id: ${{ secrets.GKE_PROJECT }}
@@ -44,8 +44,11 @@ jobs:
         gcloud --quiet auth configure-docker
 
     # Get the GKE credentials so we can deploy to the cluster
-    - run: |-
+    - uses: google-github-actions/[email protected]
-        gcloud container clusters get-credentials "$GKE_CLUSTER" --zone "$GKE_ZONE"
+      with:
+        cluster_name: ${{ env.GKE_CLUSTER }}
+        location: ${{ env.GKE_ZONE }}
+        credentials: ${{ secrets.GKE_SA_KEY }}
 
     # Build the Docker image
     - name: Build

ci/laravel.yml

@@ -12,6 +12,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+    - uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8
+      with:
+        php-version: '8.0'
     - uses: actions/checkout@v2
     - name: Copy .env
       run: php -r "file_exists('.env') || copy('.env.example', '.env');"

ci/properties/dotnet-core.properties.json

@@ -1,6 +0,0 @@
-{
-    "name": ".NET Core",
-    "description": "Build and test a .NET Core or ASP.NET Core project.",
-    "iconName": "dotnetcore",
-    "categories": ["C#", "F#", "Visual Basic", "ASP", "ASP.NET", ".NET"]
-}

ci/properties/dotnet-desktop.properties.json

@@ -1,6 +1,6 @@
 {
-    "name": ".NET Core Desktop",
+    "name": ".NET Desktop",
-    "description": "Build, test, sign and publish a desktop application built on .NET Core.",
+    "description": "Build, test, sign and publish a desktop application built on .NET.",
-    "iconName": "dotnetcore",
+    "iconName": "dotnet",
     "categories": ["C#", "Visual Basic", "WPF", ".NET"]
 }

ci/properties/dotnet.properties.json

@@ -0,0 +1,6 @@
+{
+    "name": ".NET",
+    "description": "Build and test a .NET or ASP.NET Core project.",
+    "iconName": "dotnet",
+    "categories": ["C#", "F#", "Visual Basic", "ASP", "ASP.NET", ".NET"]
+}

ci/python-package-conda.yml

@@ -14,18 +14,21 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: 3.8
-    - name: Install dependencies
+    - name: Add conda to system path
       run: |
         # $CONDA is an environment variable pointing to the root of the miniconda directory
-        $CONDA/bin/conda env update --file environment.yml --name base
+        echo $CONDA/bin >> $GITHUB_PATH
+    - name: Install dependencies
+      run: |
+        conda env update --file environment.yml --name base
     - name: Lint with flake8
       run: |
-        $CONDA/bin/conda install flake8
+        conda install flake8
         # stop the build if there are Python syntax errors or undefined names
-        $CONDA/bin/flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        $CONDA/bin/flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
     - name: Test with pytest
       run: |
         conda install pytest
-        $CONDA/bin/pytest
+        pytest

icons/dotnetcore.svg

@@ -1 +0,0 @@
-<svg fill="none" height="48" width="48" xmlns="http://www.w3.org/2000/svg"><path d="M24 48c13.255 0 24-10.745 24-24S37.255 0 24 0 0 10.745 0 24s10.745 24 24 24z" fill="#5c2d91"/><g fill="#fff"><path d="M7.923 6.657a23.67 23.67 0 1033.42 33.42z" opacity=".1"/><path d="M6.133 27.554a.999.999 0 01-.74-.31 1.02 1.02 0 01-.303-.74 1.036 1.036 0 01.303-.74.991.991 0 01.74-.318 1.013 1.013 0 01.74.318 1.028 1.028 0 01.31.74 1.013 1.013 0 01-.31.74 1.02 1.02 0 01-.74.31zM20.83 27.369h-1.937l-6.931-10.755a4.438 4.438 0 01-.43-.844h-.059c.066.615.09 1.232.074 1.85v9.749H9.972V13.884h2.049l6.746 10.563c.28.44.463.74.547.903h.037a14.26 14.26 0 01-.096-1.983v-9.483h1.576zM31.497 27.369H24.33V13.884h6.835v1.428h-5.222v4.482h4.867v1.42h-4.867v4.676h5.563zM42.082 15.312h-3.92v12.057h-1.576V15.312H32.71v-1.428h9.372z"/></g><path d="M19.98 36.541a3.647 3.647 0 01-1.716.363 2.766 2.766 0 01-2.123-.85 3.151 3.151 0 01-.799-2.22 3.3 3.3 0 01.895-2.411 3.048 3.048 0 012.278-.918c.506-.017 1.01.071 1.48.26v.739a2.959 2.959 0 00-1.48-.37 2.263 2.263 0 00-1.738.74c-.461.525-.7 1.21-.666 1.908a2.567 2.567 0 00.622 1.813 2.116 2.116 0 001.634.673 3.062 3.062 0 001.62-.415zM23.005 36.904a2.056 2.056 0 01-1.575-.658 2.3 2.3 0 01-.585-1.65 2.397 2.397 0 01.614-1.746 2.22 2.22 0 011.65-.628 1.99 1.99 0 011.546.613c.393.474.591 1.08.555 1.694a2.382 2.382 0 01-.6 1.702 2.1 2.1 0 01-1.605.673zm.052-4.046a1.354 1.354 0 00-1.08.466 1.916 1.916 0 00-.4 1.287c-.025.45.117.892.4 1.242a1.369 1.369 0 001.08.46 1.302 1.302 0 001.058-.445c.269-.367.4-.818.37-1.272.029-.457-.102-.91-.37-1.28a1.294 1.294 0 00-1.058-.458zM28.664 33.08a.873.873 0 00-.54-.141.91.91 0 00-.74.429c-.22.349-.326.757-.303 1.169V36.8h-.74v-4.438h.74v.925c.081-.286.243-.543.466-.74.193-.167.44-.26.695-.259.143-.006.286.014.422.06zM32.999 34.766h-3.13c-.02.414.114.82.378 1.14a1.376 1.376 0 001.05.399 2.22 2.22 0 001.376-.496v.666c-.457.301-.999.449-1.546.421a1.879 1.879 0 01-1.48-.606 2.478 2.478 0 01-.54-1.701 2.426 2.426 0 01.585-1.687 1.886 1.886 0 011.48-.65 1.672 1.672 0 011.346.561c.34.45.509 1.006.473 1.568zm-.74-.599a1.48 1.48 0 00-.296-.954 1.013 1.013 0 00-.813-.34 1.147 1.147 0 00-.851.362 1.635 1.635 0 00-.437.94z" fill="#f2f2f2"/></svg>