Skip to content

Commit

Permalink
Merge pull request #9591 from SethTisue/gha-windows-2.13
Browse files Browse the repository at this point in the history
  • Loading branch information
SethTisue committed Apr 23, 2021
2 parents fb73073 + 52745d0 commit d974e99
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 57 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Expand Up @@ -21,6 +21,9 @@ text eol=lf
*.txt eol=lf
*.xml eol=lf

# Some sbt launcher scripts can't handle CR in .jvmopts
.jvmopts eol=lf

# Windows-specific files get windows endings
*.bat eol=crlf
*.cmd eol=crlf
Expand Down
47 changes: 47 additions & 0 deletions .github/workflows/ci.yml
@@ -0,0 +1,47 @@
name: Scala Merge CI

on:
push:
branches: ['2.*.x']

defaults:
run:
shell: bash

jobs:
build_and_test:
name: Windows
runs-on: windows-latest
strategy:
fail-fast: false
steps:
- run: git config --global core.autocrlf false
- name: Checkout
uses: actions/checkout@v2

# Note that we don't use olafurpg/setup-scala; it wouldn't buy us anything
# over setup-java. (We don't want csbt or xsbt; we prefer the standard
# sbt launch script, which comes preinstalled on Windows (and Ubuntu).)
- name: Setup Java
uses: actions/setup-java@v2
with:
distribution: adopt
java-version: 8

- name: Cache
uses: actions/cache@v2
with:
path: |
~/.sbt
~/.ivy2/cache
~/.cache/coursier
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Build
run: |
sbt setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal
- name: Test
run: |
STARR=`cat buildcharacter.properties | grep ^maven.version.number | cut -d= -f2` && echo $STARR
sbt -Dstarr.version=$STARR setupValidateTest test:compile info testAll
35 changes: 0 additions & 35 deletions scripts/jobs/integrate/ide

This file was deleted.

22 changes: 0 additions & 22 deletions scripts/jobs/integrate/windows

This file was deleted.

0 comments on commit d974e99

Please sign in to comment.