Skip to content

Commit

Permalink
drop clang32
Browse files Browse the repository at this point in the history
  • Loading branch information
MehdiChinoune authored and lazka committed Dec 18, 2024
1 parent e3fe20f commit ea8491e
Show file tree
Hide file tree
Showing 7 changed files with 5 additions and 21 deletions.
13 changes: 0 additions & 13 deletions .github/workflows/Test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,6 @@ jobs:
run: |
$env:MSYSTEM = 'UCRT64'
msys2 ./test.sh UCRT64
- name: 🟫 test CLANG32
run: |
$env:MSYSTEM = 'CLANG32'
msys2 ./test.sh CLANG32
- name: 🟧 test CLANG64
run: |
$env:MSYSTEM = 'CLANG64'
Expand Down Expand Up @@ -124,11 +120,6 @@ jobs:
run: |
set MSYSTEM=UCRT64
msys2 ./test.sh UCRT64
- name: 🟫 test CLANG32
shell: cmd
run: |
set MSYSTEM=CLANG32
msys2 ./test.sh CLANG32
- name: 🟧 test CLANG64
shell: cmd
run: |
Expand Down Expand Up @@ -166,10 +157,6 @@ jobs:
run: msys2 ./test.sh UCRT64
env:
MSYSTEM: UCRT64
- name: 🟫 test CLANG32
run: msys2 ./test.sh CLANG32
env:
MSYSTEM: CLANG32
- name: 🟧 test CLANG64
run: msys2 ./test.sh CLANG64
env:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/Tool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
mingw32
mingw64
ucrt64
clang32
clang64
msys2:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# Setup MSYS2

**setup-msys2** is a GitHub Action (GHA) to setup an [MSYS2](https://www.msys2.org/) environment (i.e. MSYS,
MINGW32, MINGW64, UCRT64, CLANG32, CLANG64 and/or CLANGARM64 shells)
MINGW32, MINGW64, UCRT64, CLANG64 and/or CLANGARM64 shells)

It provides:

Expand Down Expand Up @@ -128,7 +128,7 @@ Find further details at [#171](https://github.com/msys2/setup-msys2/issues/171#i
#### msystem

* Type: `string`
* Allowed values: `MSYS | MINGW64 | MINGW32 | UCRT64 | CLANG32 | CLANG64 | CLANGARM64`
* Allowed values: `MSYS | MINGW64 | MINGW32 | UCRT64 | CLANG64 | CLANGARM64`
* Default: `MINGW64`

The default [environment](https://www.msys2.org/docs/environments/) that is used in the `msys2` command/shell provided by this action.
Expand Down
2 changes: 1 addition & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ branding:
icon: terminal
inputs:
msystem:
description: 'Variant of the environment to set by default: MSYS, MINGW32, MINGW64, UCRT64, CLANG32, CLANG64 or CLANGARM64'
description: 'Variant of the environment to set by default: MSYS, MINGW32, MINGW64, UCRT64, CLANG64 or CLANGARM64'
required: false
default: 'MINGW64'
path-type:
Expand Down
2 changes: 1 addition & 1 deletion main.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ function parseInput() {
let p_location = core.getInput('location');
let p_cache = core.getBooleanInput('cache');

const msystem_allowed = ['MSYS', 'MINGW32', 'MINGW64', 'UCRT64', 'CLANG32', 'CLANG64', 'CLANGARM64'];
const msystem_allowed = ['MSYS', 'MINGW32', 'MINGW64', 'UCRT64', 'CLANG64', 'CLANGARM64'];
if (!msystem_allowed.includes(p_msystem.toUpperCase())) {
throw new Error(`'msystem' needs to be one of ${ msystem_allowed.join(', ') }, got ${p_msystem}`);
}
Expand Down
3 changes: 1 addition & 2 deletions matrix/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ inputs:
description: 'Space separated list of systems to build and test the tool on.'
required: false
type: string
default: 'msys mingw32 mingw64 ucrt64 clang32 clang64'
default: 'msys mingw32 mingw64 ucrt64 clang64'
outputs:
jobs:
description: "List of MSYS2 systems to be used in the matrix of other jobs."
Expand All @@ -24,7 +24,6 @@ runs:
'mingw32': '⬛',
'mingw64': '🟦',
'ucrt64': '🟨',
'clang32': '🟫',
'clang64': '🟧',
}
jobs = [
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"MINGW32",
"MSYS",
"UCRT64",
"CLANG32",
"CLANG64"
],
"license": "MIT",
Expand Down

0 comments on commit ea8491e

Please sign in to comment.