Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream changes #133

Merged
merged 18 commits into from
Dec 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
92051a7
build(deps): bump @actions/core from 1.9.1 to 1.10.0 (#274)
dependabot[bot] Oct 3, 2022
83dbd09
build(deps-dev): bump typescript from 4.8.3 to 4.8.4 (#273)
dependabot[bot] Oct 3, 2022
ee9082f
build(deps-dev): bump @types/node from 18.7.15 to 18.7.23 (#272)
dependabot[bot] Oct 3, 2022
a024ab4
Update dist (#275)
github-actions[bot] Oct 3, 2022
6d9ff32
Upgrade to Node 16 (#283)
BalmungSan Oct 18, 2022
ff4c335
Update dist (#286)
github-actions[bot] Oct 18, 2022
6676873
build(deps-dev): bump @types/node from 18.7.23 to 18.11.0 (#285)
dependabot[bot] Oct 18, 2022
d937bf8
build(deps-dev): bump @types/node from 18.11.0 to 18.11.2 (#287)
dependabot[bot] Oct 20, 2022
946f68e
build(deps-dev): bump @typescript-eslint/parser from 5.40.0 to 5.40.1…
dependabot[bot] Oct 20, 2022
7032322
build(deps-dev): bump @typescript-eslint/eslint-plugin from 5.40.0 to…
dependabot[bot] Oct 20, 2022
7a2fa3e
Update default coursier version to 2.1.0-M7-39-gb8f3d7532 (#298)
alexarchambault Oct 28, 2022
60bee08
Update dist (#299)
github-actions[bot] Oct 28, 2022
66b17d3
build(deps-dev): bump eslint from 8.25.0 to 8.26.0 (#291)
dependabot[bot] Oct 28, 2022
e0e8aae
build(deps-dev): bump @typescript-eslint/eslint-plugin from 5.40.1 to…
dependabot[bot] Oct 28, 2022
fdec387
build(deps-dev): bump @typescript-eslint/parser from 5.40.1 to 5.41.0…
dependabot[bot] Oct 28, 2022
b76dd8a
build(deps-dev): bump @types/node from 18.11.2 to 18.11.7 (#297)
dependabot[bot] Oct 28, 2022
ba59fe1
build(deps-dev): bump @types/node from 18.11.7 to 18.11.8 (#300)
dependabot[bot] Oct 31, 2022
e718531
Merge remote-tracking branch 'coursier/main' into sync-upstream
Gedochao Dec 8, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,31 @@ jobs:
jvm: ['11', 'temurin:17']
steps:
- uses: actions/checkout@v3
- run: |

- name: Build
shell: bash -l {0}
run: |
nvm use lts/gallium
npm install
- run: |
npm run all

# create an sbt file to enabling sbt caching
- run: echo 'name := "foo"' > build.sbt
- id: scala-cli-setup
uses: ./
with:
jvm: ${{ matrix.jvm }}
apps: sbt sbtn ammonite bloop:1.4.11

# - uses: coursier/cache-action@v5
- run: echo cs-version=${{ steps.scala-cli-setup.outputs.cs-version }}
- run: echo $PATH

# test Java
- run: echo $JAVA_HOME
- run: java -version
- run: cs java -version

# test installed apps
- run: sbtn.bat show name </dev/null
shell: bash
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/update-dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@ jobs:
- uses: actions/checkout@v3
with:
ssh-key: ${{ secrets.SCALA_CLI_SETUP_INTERNAL_KEY }}
- run: npm install
- run: npm run all
- name: Build
shell: bash -l {0}
run: |
nvm use lts/gallium
npm install
npm run all

- name: Create Pull Request
id: cpr
uses: peter-evans/create-pull-request@v4
Expand All @@ -21,6 +26,7 @@ jobs:
author: GitHub <noreply@github.com>
delete-branch: true
title: Update dist

- name: Check Pull Request
run: |
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
Expand Down
5 changes: 3 additions & 2 deletions dist/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import * as path from 'path'
import * as tc from '@actions/tool-cache'

let csVersion = core.getInput('version')
if (!csVersion) csVersion = '2.1.0-M6-49-gff26f8e39'
if (!csVersion) csVersion = '2.1.0-M7-39-gb8f3d7532'
const scalaCLIVersion = '0.1.18'

const coursierVersionSpec = csVersion
Expand Down Expand Up @@ -124,8 +124,9 @@ async function run(): Promise<void> {
)
}
})
} catch (error: any) {
core.setFailed(error.message)
} catch (error: unknown) {
const msg = error instanceof Error ? error.message : String(error)
core.setFailed(msg)
}
}

Expand Down