From 0b0f117a00bf1aabbf4de77c6fab42d4ad1a1bd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Leh=C3=B3czky?= Date: Tue, 12 Jul 2022 14:17:25 +0200 Subject: [PATCH] Removing setup-edge since Edge is now preinstalled on Linux GitHub-hosted agents --- .github/actions/setup-edge-linux/action.yml | 17 ----------------- .github/actions/setup-edge-linux/setup-edge.ps1 | 11 ----------- .../workflows/build-and-test-orchard-core.yml | 12 ------------ Docs/Actions.md | 1 - 4 files changed, 41 deletions(-) delete mode 100644 .github/actions/setup-edge-linux/action.yml delete mode 100644 .github/actions/setup-edge-linux/setup-edge.ps1 diff --git a/.github/actions/setup-edge-linux/action.yml b/.github/actions/setup-edge-linux/action.yml deleted file mode 100644 index 2376c2645..000000000 --- a/.github/actions/setup-edge-linux/action.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: Set up Microsoft Edge on Linux -description: Sets up Microsoft Edge on Linux. - -inputs: - edge-version: - required: false - default: 102.0.1245.39-1 - description: Version of Microsoft Edge to set up on Linux. - -runs: - using: "composite" - steps: - - name: Set up Microsoft Edge - if: ${{ runner.os == 'Linux' }} - shell: pwsh - run: | - ${{ github.action_path }}/setup-edge.ps1 ${{ inputs.edge-version }} diff --git a/.github/actions/setup-edge-linux/setup-edge.ps1 b/.github/actions/setup-edge-linux/setup-edge.ps1 deleted file mode 100644 index 8f68174d1..000000000 --- a/.github/actions/setup-edge-linux/setup-edge.ps1 +++ /dev/null @@ -1,11 +0,0 @@ -# Issue for tool request: https://github.com/actions/virtual-environments/issues/5845. - -param( - [string] - $EdgeVersion -) - -bash -c "curl -O https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${EdgeVersion}_amd64.deb" -bash -c "sudo apt install ./microsoft-edge-stable_${EdgeVersion}_amd64.deb" - -Write-Output "/opt/microsoft/msedge" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append diff --git a/.github/workflows/build-and-test-orchard-core.yml b/.github/workflows/build-and-test-orchard-core.yml index a4299d549..356786833 100644 --- a/.github/workflows/build-and-test-orchard-core.yml +++ b/.github/workflows/build-and-test-orchard-core.yml @@ -68,11 +68,6 @@ on: type: number default: 360 description: Configuration for the timeout-minutes parameter of the workflow. The 360 is GitHub's default. - setup-edge-on-linux: - required: false - type: boolean - default: false - description: Indicates whether to enable setup Edge on Linux. jobs: build-and-test: @@ -117,13 +112,6 @@ jobs: with: location: ${{ inputs.build-directory}} - # Firefox and Chrome browsers are installed by default on ubuntu-latest and windows-latest, and Edge is installed by - # default on windows-latest, so here we install Edge on ubuntu-latest. It seems Linux support is planned here - # (https://github.com/browser-actions/setup-edge), after this completes we can use it. - - name: Set up Edge - uses: Lombiq/GitHub-Actions/.github/actions/setup-edge-linux@dev - if: ${{ inputs.setup-edge-on-linux }} - - name: Tests uses: Lombiq/GitHub-Actions/.github/actions/test-dotnet@dev with: diff --git a/Docs/Actions.md b/Docs/Actions.md index 4185f4a01..2f0490f27 100644 --- a/Docs/Actions.md +++ b/Docs/Actions.md @@ -11,7 +11,6 @@ In addition to the below short explanations, check out the inline documentation - `publish-nuget`: Publishes the content of the current directory as a NuGet package. - `setup-azurite`: Sets up the [Azurite Azure Blob Storage Emulator](https://docs.microsoft.com/en-us/azure/storage/common/storage-use-azurite) via NPM. - `setup-dotnet`: Sets up the .NET SDK. -- `setup-edge-linux`: Sets up the Microsoft Edge on Linux. - `setup-sql-server`: Sets up SQL Server with Lombiq-recommended defaults. - `test-dotnet`: Runs .NET unit and UI tests (with the [Lombiq UI Testing Toolbox for Orchard Core](https://github.com/Lombiq/UI-Testing-Toolbox)), generates a test report, and uploads UI testing failure dumps to artifacts. - `verify-submodule-pull-request`: Assuming that the current repository is a submodule in another repository, this action verifies that a pull request with a matching issue code has been opened there as well.