From 778f6e55ec4c085609530cab7e80909d6b031b2e Mon Sep 17 00:00:00 2001 From: David A Roberts Date: Sat, 5 Dec 2020 09:30:21 +1000 Subject: [PATCH 01/12] Add conda to system path --- ci/python-package-conda.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/ci/python-package-conda.yml b/ci/python-package-conda.yml index 1567e18..7bae7e2 100644 --- a/ci/python-package-conda.yml +++ b/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 From 32294ec2354ba59641daf08817e05d23642bd932 Mon Sep 17 00:00:00 2001 From: Andy McKay Date: Mon, 7 Dec 2020 10:11:02 -0800 Subject: [PATCH 02/12] add in a person icon --- automation/properties/manual.properties.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/properties/manual.properties.json b/automation/properties/manual.properties.json index f08cbc3..1befabe 100644 --- a/automation/properties/manual.properties.json +++ b/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"] } From 4dae3bbf12e6818e83374b9862805590f0f80e30 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Thu, 10 Dec 2020 17:35:47 +0000 Subject: [PATCH 03/12] Update .NET Core branding to .NET Per the branding that .NET 5.0 is the next release after .NET Core 3.1. --- ci/{dotnet-core-desktop.yml => dotnet-desktop.yml} | 0 ci/{dotnet-core.yml => dotnet.yml} | 4 ++-- ci/properties/dotnet-core.properties.json | 6 ------ ...sktop.properties.json => dotnet-desktop.properties.json} | 6 +++--- ci/properties/dotnet.properties.json | 6 ++++++ icons/dotnetcore.svg | 1 - 6 files changed, 11 insertions(+), 12 deletions(-) rename ci/{dotnet-core-desktop.yml => dotnet-desktop.yml} (100%) rename ci/{dotnet-core.yml => dotnet.yml} (91%) delete mode 100644 ci/properties/dotnet-core.properties.json rename ci/properties/{dotnet-core-desktop.properties.json => dotnet-desktop.properties.json} (56%) create mode 100644 ci/properties/dotnet.properties.json delete mode 100644 icons/dotnetcore.svg diff --git a/ci/dotnet-core-desktop.yml b/ci/dotnet-desktop.yml similarity index 100% rename from ci/dotnet-core-desktop.yml rename to ci/dotnet-desktop.yml diff --git a/ci/dotnet-core.yml b/ci/dotnet.yml similarity index 91% rename from ci/dotnet-core.yml rename to ci/dotnet.yml index 9ee1a7d..4cb32c0 100644 --- a/ci/dotnet-core.yml +++ b/ci/dotnet.yml @@ -1,4 +1,4 @@ -name: .NET Core +name: .NET on: push: @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Setup .NET Core + - name: Setup .NET uses: actions/setup-dotnet@v1 with: dotnet-version: 3.1.301 diff --git a/ci/properties/dotnet-core.properties.json b/ci/properties/dotnet-core.properties.json deleted file mode 100644 index 3386a3d..0000000 --- a/ci/properties/dotnet-core.properties.json +++ /dev/null @@ -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"] -} diff --git a/ci/properties/dotnet-core-desktop.properties.json b/ci/properties/dotnet-desktop.properties.json similarity index 56% rename from ci/properties/dotnet-core-desktop.properties.json rename to ci/properties/dotnet-desktop.properties.json index 9b2aa35..f6e1cb8 100644 --- a/ci/properties/dotnet-core-desktop.properties.json +++ b/ci/properties/dotnet-desktop.properties.json @@ -1,6 +1,6 @@ { - "name": ".NET Core Desktop", - "description": "Build, test, sign and publish a desktop application built on .NET Core.", - "iconName": "dotnetcore", + "name": ".NET Desktop", + "description": "Build, test, sign and publish a desktop application built on .NET.", + "iconName": "dotnet", "categories": ["C#", "Visual Basic", "WPF", ".NET"] } \ No newline at end of file diff --git a/ci/properties/dotnet.properties.json b/ci/properties/dotnet.properties.json new file mode 100644 index 0000000..b3feafb --- /dev/null +++ b/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"] +} diff --git a/icons/dotnetcore.svg b/icons/dotnetcore.svg deleted file mode 100644 index 6d31060..0000000 --- a/icons/dotnetcore.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file From b05136d6b3e487fb91fce91c0f3267de1a532efe Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Thu, 10 Dec 2020 17:41:44 +0000 Subject: [PATCH 04/12] Nit: Title restore step with "restore" This is more like how folks generally refer to it in .NET-land. --- ci/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/dotnet.yml b/ci/dotnet.yml index 4cb32c0..354d2dc 100644 --- a/ci/dotnet.yml +++ b/ci/dotnet.yml @@ -17,7 +17,7 @@ jobs: 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 From 0c4ccab691ac8790d8682218a943e8ffacc8cf97 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Thu, 10 Dec 2020 17:44:30 +0000 Subject: [PATCH 05/12] Don't specify configuration for dotnet build Since `dotnet test` below didn't specify the Release configuration, it used the default configuration (generally Debug). --- ci/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/dotnet.yml b/ci/dotnet.yml index 354d2dc..198096c 100644 --- a/ci/dotnet.yml +++ b/ci/dotnet.yml @@ -20,6 +20,6 @@ jobs: - 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 From 2c1a53ec9376a511d56922f740749cafaeb92f84 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Thu, 10 Dec 2020 17:42:57 +0000 Subject: [PATCH 06/12] Don't build when running tests If the workflow is going to split restore, build, and test into separate steps, each should use the result of the prior. Build was invoked with `--no-restore` but test was restoring, building, and then testing. --- ci/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/dotnet.yml b/ci/dotnet.yml index 198096c..aa0a093 100644 --- a/ci/dotnet.yml +++ b/ci/dotnet.yml @@ -22,4 +22,4 @@ jobs: - name: Build run: dotnet build --no-restore - name: Test - run: dotnet test --no-restore --verbosity normal + run: dotnet test --no-build --verbosity normal From 14acff1f1ef8faf0b93e11598757206f04d9bfc5 Mon Sep 17 00:00:00 2001 From: Bharath KKB Date: Mon, 14 Dec 2020 18:38:42 -0600 Subject: [PATCH 07/12] fix: switch to new google actions org --- ci/google.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/google.yml b/ci/google.yml index b9313b2..3d7f9f5 100644 --- a/ci/google.yml +++ b/ci/google.yml @@ -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 }} From c5e7bc70b545461c00a7e17980d939e3dd81cbca Mon Sep 17 00:00:00 2001 From: Bharath KKB Date: Mon, 14 Dec 2020 18:49:58 -0600 Subject: [PATCH 08/12] use GKE action for credentials --- ci/google.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ci/google.yml b/ci/google.yml index 3d7f9f5..0a53cfd 100644 --- a/ci/google.yml +++ b/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 @@ -44,8 +44,11 @@ jobs: gcloud --quiet auth configure-docker # Get the GKE credentials so we can deploy to the cluster - - run: |- - gcloud container clusters get-credentials "$GKE_CLUSTER" --zone "$GKE_ZONE" + - uses: google-github-actions/get-gke-credentials@v0.2.1 + with: + cluster_name: ${{ secrets.GKE_PROJECT }} + location: ${{ env.GKE_ZONE }} + credentials: ${{ secrets.GKE_SA_KEY }} # Build the Docker image - name: Build From ab930e94bfd8f9196962625bf69b8c406bae15c1 Mon Sep 17 00:00:00 2001 From: Bharath KKB Date: Mon, 14 Dec 2020 18:59:18 -0600 Subject: [PATCH 09/12] fix cluster var --- ci/google.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/google.yml b/ci/google.yml index 0a53cfd..cc3cffb 100644 --- a/ci/google.yml +++ b/ci/google.yml @@ -46,7 +46,7 @@ jobs: # Get the GKE credentials so we can deploy to the cluster - uses: google-github-actions/get-gke-credentials@v0.2.1 with: - cluster_name: ${{ secrets.GKE_PROJECT }} + cluster_name: ${{ env.GKE_CLUSTER }} location: ${{ env.GKE_ZONE }} credentials: ${{ secrets.GKE_SA_KEY }} From 038c492e5dcbab0b022a022f820754565ff8b23a Mon Sep 17 00:00:00 2001 From: Bikram Lama Date: Thu, 17 Dec 2020 01:57:39 +0545 Subject: [PATCH 10/12] Added PHP version (default 8.0) --- ci/laravel.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/laravel.yml b/ci/laravel.yml index b32ad88..5f9454c 100644 --- a/ci/laravel.yml +++ b/ci/laravel.yml @@ -12,6 +12,9 @@ jobs: runs-on: ubuntu-latest steps: + - uses: shivammathur/setup-php@v2 + with: + php-version: '8.0' - uses: actions/checkout@v2 - name: Copy .env run: php -r "file_exists('.env') || copy('.env.example', '.env');" From 916f29234a96c38a81bc253deed12d8d0904f35b Mon Sep 17 00:00:00 2001 From: Yashovardhan Dhanania Date: Sat, 19 Dec 2020 01:31:28 +0530 Subject: [PATCH 11/12] Android: Granting execute permission for gradlew (#70) * Granting execute permission for gradlew In https://github.com/yashovardhan99/HealersDiary, while testing this action, I noticed `./gradlew build` fails because it does not have execute permissions. Adding the execute permissions using `chmod` fixes this issue. * fixing line endings This should fix it * Renormalizing changes --- ci/android.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/android.yml b/ci/android.yml index c88c515..6954a61 100644 --- a/ci/android.yml +++ b/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 From 1611798954e4c1ceda5e9e17e8ffaa30b436fe04 Mon Sep 17 00:00:00 2001 From: Andy McKay Date: Fri, 18 Dec 2020 12:54:48 -0800 Subject: [PATCH 12/12] Update ci/laravel.yml --- ci/laravel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/laravel.yml b/ci/laravel.yml index 5f9454c..d54921e 100644 --- a/ci/laravel.yml +++ b/ci/laravel.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: shivammathur/setup-php@v2 + - uses: shivammathur/setup-php@b7d1d9c9a92d8d8463ce36d7f60da34d461724f8 with: php-version: '8.0' - uses: actions/checkout@v2