Skip to content

Commit f571277

Browse files
fix: remove haskell version option
we're not including binaries for it anymore
1 parent 491d550 commit f571277

File tree

3 files changed

+3
-14
lines changed

3 files changed

+3
-14
lines changed

.github/workflows/test-workflow.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ jobs:
77
fail-fast: false
88
matrix:
99
os: [ubuntu-latest, macos-latest, windows-latest]
10-
use-bootstrap: [false, true]
1110
fpm-version: ['v0.1.0','v0.1.1','latest']
1211

1312
steps:
@@ -19,7 +18,6 @@ jobs:
1918
with:
2019
github-token: ${{ secrets.GITHUB_TOKEN }}
2120
fpm-version: ${{ matrix.fpm-version }}
22-
use-haskell: ${{ matrix.use-bootstrap }}
2321

2422
- name: test fpm
2523
run: fpm --help

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,4 @@ __`github-token`__ (*only needed if `fpm-version` is `'latest'` or not specified
3030
__`fpm-version`__ (*optional,default:*`'latest'`) the tag corresponding a Github release from which to fetch the `fpm` binary.
3131
- If set to `'latest'` (_default_) then the latest `fpm` release at [fortran-lang/fpm](https://github.com/fortran-lang/fpm/releases/latest) will be substituted. `github-token` must be provided if `fpm-version` is `'latest'`.
3232

33-
__`use-haskell`__ (*optional,default:*`false`) whether to fetch and use the legacy Haskell implementation
34-
3533
__`fpm-repository`__ (*optional, default:* `https://github.com/fortran-lang/fpm`) which Github fork to fetch release binaries from.

index.js

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ async function main(){
1414
// Get inputs
1515
const token = core.getInput('github-token');
1616

17-
const useHaskell = core.getInput('use-haskell').toLowerCase() === 'true';
18-
console.log(`use-haskell: ${useHaskell}`);
19-
2017
var fpmVersion = core.getInput('fpm-version');
2118
console.log(`fpm-version: ${fpmVersion}`);
2219

@@ -44,7 +41,7 @@ async function main(){
4441

4542
// Build download path
4643
const fetchPath = fpmRepo + '/releases/download/' + fpmVersion + '/';
47-
const filename = getFPMFilename(useHaskell,fpmVersion,process.platform);
44+
const filename = getFPMFilename(fpmVersion,process.platform);
4845

4946
console.log(`This platform is ${process.platform}`);
5047
console.log(`Fetching fpm from ${fetchPath}${filename}`);
@@ -96,20 +93,16 @@ async function main(){
9693

9794
// Construct the filename for an fpm release
9895
//
99-
// fpm-[haskell-]<version>-<os>-<arch>[.exe]
96+
// fpm-<version>-<os>-<arch>[.exe]
10097
//
10198
// <version> is a string of form X.Y.Z corresponding to a release of fpm
10299
// <os> is either 'linux', 'macos', or 'windows'
103100
// <arch> here is always 'x86_64'
104101
//
105-
function getFPMFilename(useHaskell,fpmVersion,platform){
102+
function getFPMFilename(fpmVersion,platform){
106103

107104
var filename = 'fpm-';
108105

109-
if (useHaskell) {
110-
filename += 'haskell-';
111-
}
112-
113106
filename += fpmVersion.replace('v','') + '-';
114107

115108
if (platform === 'linux') {

0 commit comments

Comments
 (0)