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"] } 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 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 62% rename from ci/dotnet-core.yml rename to ci/dotnet.yml index 9ee1a7d..aa0a093 100644 --- a/ci/dotnet-core.yml +++ b/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 diff --git a/ci/google.yml b/ci/google.yml index b9313b2..cc3cffb 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 @@ -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: |- - gcloud container clusters get-credentials "$GKE_CLUSTER" --zone "$GKE_ZONE" + - uses: google-github-actions/get-gke-credentials@v0.2.1 + with: + cluster_name: ${{ env.GKE_CLUSTER }} + location: ${{ env.GKE_ZONE }} + credentials: ${{ secrets.GKE_SA_KEY }} # Build the Docker image - name: Build diff --git a/ci/laravel.yml b/ci/laravel.yml index b32ad88..d54921e 100644 --- a/ci/laravel.yml +++ b/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');" 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/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 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