Skip to content

Commit

Permalink
Remove excludes for windows and vscode versions.
Browse files Browse the repository at this point in the history
- Newer versions of VSCode seem to work okay now on regular CI so adding it back into nightly
- Add sbt setup step to CI files to ensure all runners will have sbt installed.

Closes apache#1101
  • Loading branch information
shanedell committed Jan 21, 2025
1 parent 68ec5f5 commit 57df26c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 17 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,9 @@ jobs:
distribution: ${{ matrix.java_distribution }}
java-version: ${{ matrix.java_version }}

- name: Install sbt - macos-13 only
run: brew install sbt
if: matrix.os == 'macos-13'
# some runner oses don't have sbt by default
- name: Setup sbt
uses: sbt/setup-sbt@v1

- name: Install Node.js
uses: actions/[email protected]
Expand Down
17 changes: 3 additions & 14 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,6 @@ jobs:
# java 8 not available on latest macos
- os: macos-latest
java_version: 8
# Currently newer versions of VSCode don't work the same on Windows, this will need looked into.
# TODO: Remove the below windows excludes once the extension tests are working with newer versions of VSCode
- os: windows-2019
vscode: 'stable'
- os: windows-2019
vscode: 'insiders'
- os: windows-latest
vscode: 'stable'
- os: windows-latest
vscode: 'insiders'
fail-fast: false # don't immediately fail all other jobs if a single job fails
runs-on: ${{ matrix.os }}
defaults:
Expand All @@ -71,10 +61,9 @@ jobs:
with:
node-version: ${{ matrix.node }}

# macos-13 & macos-latest doesn't seem to have sbt installed by default
- name: Install sbt - macos-latest
run: brew install sbt
if: matrix.os == 'macos-13' || matrix.os == 'macos-latest'
# some runner oses don't have sbt by default
- name: Setup sbt
uses: sbt/setup-sbt@v1

############################################################
# Build & Package
Expand Down

0 comments on commit 57df26c

Please sign in to comment.