Skip to content

Commit

Permalink
fix: remove haskell version option
Browse files Browse the repository at this point in the history
we're not including binaries for it anymore
  • Loading branch information
everythingfunctional committed Nov 5, 2021
1 parent 491d550 commit f571277
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 14 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
use-bootstrap: [false, true]
fpm-version: ['v0.1.0','v0.1.1','latest']

steps:
Expand All @@ -19,7 +18,6 @@ jobs:
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
fpm-version: ${{ matrix.fpm-version }}
use-haskell: ${{ matrix.use-bootstrap }}

- name: test fpm
run: fpm --help
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,4 @@ __`github-token`__ (*only needed if `fpm-version` is `'latest'` or not specified
__`fpm-version`__ (*optional,default:*`'latest'`) the tag corresponding a Github release from which to fetch the `fpm` binary.
- 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'`.

__`use-haskell`__ (*optional,default:*`false`) whether to fetch and use the legacy Haskell implementation

__`fpm-repository`__ (*optional, default:* `https://github.com/fortran-lang/fpm`) which Github fork to fetch release binaries from.
13 changes: 3 additions & 10 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ async function main(){
// Get inputs
const token = core.getInput('github-token');

const useHaskell = core.getInput('use-haskell').toLowerCase() === 'true';
console.log(`use-haskell: ${useHaskell}`);

var fpmVersion = core.getInput('fpm-version');
console.log(`fpm-version: ${fpmVersion}`);

Expand Down Expand Up @@ -44,7 +41,7 @@ async function main(){

// Build download path
const fetchPath = fpmRepo + '/releases/download/' + fpmVersion + '/';
const filename = getFPMFilename(useHaskell,fpmVersion,process.platform);
const filename = getFPMFilename(fpmVersion,process.platform);

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

// Construct the filename for an fpm release
//
// fpm-[haskell-]<version>-<os>-<arch>[.exe]
// fpm-<version>-<os>-<arch>[.exe]
//
// <version> is a string of form X.Y.Z corresponding to a release of fpm
// <os> is either 'linux', 'macos', or 'windows'
// <arch> here is always 'x86_64'
//
function getFPMFilename(useHaskell,fpmVersion,platform){
function getFPMFilename(fpmVersion,platform){

var filename = 'fpm-';

if (useHaskell) {
filename += 'haskell-';
}

filename += fpmVersion.replace('v','') + '-';

if (platform === 'linux') {
Expand Down

0 comments on commit f571277

Please sign in to comment.