Skip to content

Commit 73bd6e7

Browse files
committed
refactor: remove platform input
1 parent 9597e6c commit 73bd6e7

File tree

4 files changed

+3
-12
lines changed

4 files changed

+3
-12
lines changed

.github/workflows/CI-CD.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ jobs:
4040
- name: Setup Fortran
4141
uses: gha3mi/setup-fortran-conda@dev
4242
with:
43-
platform: ${{ matrix.os }}
4443
compiler: ${{ matrix.compiler }}
4544
compiler-version: ${{ matrix.compiler-version }}
4645
extra-packages: ${{ matrix.extra-packages }}
@@ -67,7 +66,6 @@ jobs:
6766
- name: Setup Fortran
6867
uses: gha3mi/setup-fortran-conda@dev
6968
with:
70-
platform: ${{ matrix.os }}
7169
compiler: ${{ matrix.compiler }}
7270
compiler-version: ${{ matrix.compiler-version }}
7371
extra-packages: ${{ matrix.extra-packages }}
@@ -102,7 +100,6 @@ jobs:
102100
- name: Setup Fortran
103101
uses: gha3mi/setup-fortran-conda@dev
104102
with:
105-
platform: ${{ matrix.os }}
106103
compiler: ${{ matrix.compiler }}
107104
compiler-version: ${{ matrix.compiler-version }}
108105
extra-packages: ${{ matrix.extra-packages }}
@@ -140,7 +137,6 @@ jobs:
140137
- name: Setup Fortran
141138
uses: gha3mi/setup-fortran-conda@dev
142139
with:
143-
platform: ${{ matrix.os }}
144140
compiler: ${{ matrix.compiler }}
145141
compiler-version: ${{ matrix.compiler-version }}
146142
extra-packages: ${{ matrix.extra-packages }}

README.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ jobs:
6868
- name: Setup Fortran
6969
uses: gha3mi/setup-fortran-conda@latest
7070
with:
71-
platform: ${{ matrix.os }}
7271
compiler: ${{ matrix.compiler }}
7372
compiler-version: ${{ matrix.compiler-version }}
7473
extra-packages: ${{ matrix.extra-packages }}
@@ -216,7 +215,6 @@ jobs:
216215
- name: Setup Fortran
217216
uses: gha3mi/setup-fortran-conda@latest
218217
with:
219-
platform: ${{ matrix.os }}
220218
compiler: ${{ matrix.compiler }}
221219
compiler-version: ${{ matrix.compiler-version }}
222220
extra-packages: ${{ matrix.extra-packages }}
@@ -252,7 +250,6 @@ jobs:
252250
- name: Setup Fortran
253251
uses: gha3mi/setup-fortran-conda@latest
254252
with:
255-
platform: ${{ matrix.os }}
256253
compiler: ${{ matrix.compiler }}
257254
compiler-version: ${{ matrix.compiler-version }}
258255
extra-packages: ${{ matrix.extra-packages }}
@@ -290,7 +287,6 @@ jobs:
290287
- name: Setup Fortran
291288
uses: gha3mi/setup-fortran-conda@latest
292289
with:
293-
platform: ${{ matrix.os }}
294290
compiler: ${{ matrix.compiler }}
295291
compiler-version: ${{ matrix.compiler-version }}
296292
extra-packages: ${{ matrix.extra-packages }}
@@ -425,7 +421,6 @@ test_mpi_fpm:
425421
- name: Setup Fortran
426422
uses: gha3mi/setup-fortran-conda@latest
427423
with:
428-
platform: ${{ matrix.os }}
429424
compiler: ${{ matrix.compiler }}
430425
compiler-version: ${{ matrix.compiler-version }}
431426
extra-packages: ${{ matrix.extra-packages }}

action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,14 @@ runs:
146146
channels: conda-forge, defaults
147147

148148
- name: Run Fortran compiler setup script
149-
if: ${{ inputs.compiler != '' && inputs.platform != '' }}
149+
if: ${{ inputs.compiler != '' }}
150150
shell: bash
151151
run: |
152152
node "${{ github.action_path }}/index.js"
153153
env:
154154
INPUT_COMPILER: ${{ inputs.compiler }}
155155
INPUT_COMPILER_VERSION: ${{ inputs.compiler-version }}
156-
INPUT_PLATFORM: ${{ inputs.platform }}
156+
INPUT_PLATFORM: ${{ runner.os }}
157157
INPUT_EXTRA_PACKAGES: ${{ inputs.extra-packages }}
158158
INPUT_FPM_VERSION: ${{ inputs.fpm-version }}
159159

index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ async function run() {
2323
const extrasInput = process.env.INPUT_EXTRA_PACKAGES || '';
2424
const fpmVersion = process.env.INPUT_FPM_VERSION || '';
2525

26-
const osKey = platform.includes('ubuntu') ? 'lin'
26+
const osKey = platform.includes('ubuntu') || platform.includes('linux') ? 'lin'
2727
: platform.includes('windows') ? 'win'
2828
: platform.includes('macos') ? 'mac'
2929
: undefined;

0 commit comments

Comments
 (0)