From 1987828d74feef27fc743075124f4c1ea1a66aa6 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sun, 1 Jan 2023 22:10:07 +0100 Subject: x86 is no longer supported Neither by Chocolatey nor by (according to Chocolatey package authors) the upstream. --- .github/workflows/test.yml | 4 +--- README.md | 5 ----- action.yml | 8 -------- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 875a5b8..b0fb13a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,6 @@ jobs: strategy: fail-fast: false matrix: - platform: [x86, x64] env: ['', 'winsymlinks:nativestrict'] hardlinks: [0, 1] @@ -26,7 +25,7 @@ jobs: runs-on: windows-latest - name: '${{ matrix.platform }} / ${{ matrix.env_descr }} / ${{ matrix.hardlinks_descr }}' + name: '${{ matrix.env_descr }} / ${{ matrix.hardlinks_descr }}' defaults: run: @@ -43,7 +42,6 @@ jobs: - name: Set up Cygwin uses: ./ with: - platform: '${{ matrix.platform }}' install-dir: C:\cg packages: cmake gcc-g++ env: '${{ matrix.env }}' diff --git a/README.md b/README.md index 80a2378..c64d335 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,6 @@ Use it in your workflow like this: - name: Set up Cygwin uses: egor-tensin/setup-cygwin@v3 with: - platform: x64 packages: cmake gcc-g++ # Cygwin executables are added to PATH, so you can call them directly: @@ -31,8 +30,6 @@ Use it in your workflow like this: basic shell: C:\tools\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr '{0}' -* `x64` is the default value for the `platform` parameter and can be omitted. -Use `x86` if you want to install the 32-bit Cygwin. * Specify any additional packages to be installed as a space-separated list in the `packages` parameter. * Set the installation directory using the `install-dir` parameter @@ -45,8 +42,6 @@ API | Input | Value | Default | Description | ----------- | ------- | ------- | ----------- -| platform | x64 | ✓ | Install the 64-bit version. -| | *any* | | Install the 32-bit version. | install-dir | *empty* | ✓ | Install to C:\tools\cygwin. | | *any* | | Install to the specified directory. | packages | *empty* | ✓ | Don't install any additional packages. diff --git a/action.yml b/action.yml index d06f4d3..69df7a5 100644 --- a/action.yml +++ b/action.yml @@ -2,10 +2,6 @@ name: Install Cygwin description: Install Cygwin & packages inputs: - platform: - description: Target platform - required: false - default: x64 install-dir: description: Installation directory required: false @@ -38,7 +34,6 @@ runs: shell: pwsh - run: | - New-Variable x64 -Value ('${{ inputs.platform }}' -eq 'x64') -Option Constant New-Variable install_dir -Value '${{ inputs.install-dir }}' -Option Constant New-Variable packages -Value '${{ inputs.packages }}' -Option Constant @@ -65,9 +60,6 @@ runs: '--no-progress', "--package-parameters='/InstallDir:$install_dir'" ) - if (!$x64) { - $choco_params += '--x86' - } # Assuming that Cygwin is not installed when this is run. & $choco $choco_params -- cgit v1.2.3