Skip to content

Commit

Permalink
Upgrade to checkout@v3, setup-java@v3, setup-node@v3, action-junit-re…
Browse files Browse the repository at this point in the history
…port@v3 (#2466)

* Use setup-java@v3 instead of setup-scala
  • Loading branch information
xerial committed Oct 18, 2022
1 parent 64a5e76 commit 0e8312c
Show file tree
Hide file tree
Showing 11 changed files with 82 additions and 66 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/codecov.yml
Expand Up @@ -16,10 +16,11 @@ jobs:
name: Coverage test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v11
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
java-version: zulu@1.17
distribution: 'temurin'
java-version: '17'
- name: Scala 2.13 test with coverage report
run: ./sbt "; coverage; projectJVM/test; projectJVM/coverageReport; projectJVM/coverageAggregate"
- uses: codecov/codecov-action@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doc.yml
Expand Up @@ -14,7 +14,7 @@ jobs:
name: Update docs
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Setup Git
run: |
git config --global user.email "leo@xerial.org"
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/package-test.yml
Expand Up @@ -15,9 +15,10 @@ jobs:
name: Packaging Test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v11
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
java-version: zulu@1.11
distribution: 'zulu'
java-version: '11'
- name: Packaging test
run: ./sbt publishAllLocal
7 changes: 4 additions & 3 deletions .github/workflows/release-airspec.yml
Expand Up @@ -11,15 +11,16 @@ jobs:
name: Publish AirSpec
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 10000
# Fetch all tags so that sbt-dynver can find the previous release version
- run: git fetch --tags -f
# Install OpenJDK 11
- uses: olafurpg/setup-scala@v11
- uses: actions/setup-java@v3
with:
java-version: zulu@1.11
distrubution: 'zulu'
java-version: '11'
- name: Setup GPG
env:
PGP_SECRET: ${{ secrets.PGP_SECRET }}
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/release-js.yml
Expand Up @@ -11,14 +11,15 @@ jobs:
name: Publish Scala.js
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 10000
# Fetch all tags so that sbt-dynver can find the previous release version
- run: git fetch --tags -f
- uses: olafurpg/setup-scala@v11
- uses: actions/setup-java@v3
with:
java-version: zulu@1.11
distrubution: 'zulu'
java-version: '11'
- name: Setup GPG
env:
PGP_SECRET: ${{ secrets.PGP_SECRET }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-notes.yml
Expand Up @@ -11,11 +11,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- id: prep
run: |
release_version=$(echo ${{ github.ref }} | sed -e 's/[^0-9]//g')
echo "::set-output name=release_version::$release_version"
echo "release_version=${release_version}" >> $GITHUB_ENV
- name: Create Release
id: create_release
uses: actions/create-release@v1
Expand All @@ -25,6 +25,6 @@ jobs:
tag_name: ${{ github.ref }}
release_name: ${{ github.ref }}
body:
'Release notes: https://wvlet.org/airframe/docs/release-notes#${{ steps.prep.outputs.release_version }}'
'Release notes: https://wvlet.org/airframe/docs/release-notes#${{ env.release_version }}'
draft: false
prerelease: false
7 changes: 4 additions & 3 deletions .github/workflows/release-sbt-plugin.yml
Expand Up @@ -11,15 +11,16 @@ jobs:
name: Publish sbt-airframe plugin
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 10000
# Fetch all tags so that sbt-dynver can find the previous release version
- run: git fetch --tags -f
# Install OpenJDK 11
- uses: olafurpg/setup-scala@v10
- uses: actions/setup-java@v3
with:
java-version: zulu@1.11
distrubtion: 'zulu'
java-version: '11'
- name: Setup GPG
env:
PGP_SECRET: ${{ secrets.PGP_SECRET }}
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/release.yml
Expand Up @@ -11,15 +11,16 @@ jobs:
name: Publish Scala JVM
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 10000
# Fetch all tags so that sbt-dynver can find the previous release version
- run: git fetch --tags -f
# Install OpenJDK 11
- uses: olafurpg/setup-scala@v11
- uses: actions/setup-java@v3
with:
java-version: zulu@1.11
distribution: 'zulu'
java-version: '11'
- name: Setup GPG
env:
PGP_SECRET: ${{ secrets.PGP_SECRET }}
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/sbt-integration.yml
Expand Up @@ -23,14 +23,15 @@ jobs:
name: sbt-airframe
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 10000
# Fetch all tags so that sbt-dynver can find the previous release version
- run: git fetch --tags -f
- uses: olafurpg/setup-scala@v11
- uses: actions/setup-java@v3
with:
java-version: zulu@1.17
distribution: 'temurin'
java-version: '17'
- name: Get Airframe version
run: echo "AIRFRAME_VERSION=$(./scripts/dynver.sh)" >> $GITHUB_ENV
- name: Check Airframe version
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/snapshot.yml
Expand Up @@ -17,14 +17,15 @@ jobs:
name: Publish snapshots
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 10000
# Fetch all tags so that sbt-dynver can find the previous release version
- run: git fetch --tags
- uses: olafurpg/setup-scala@v11
- uses: actions/setup-java@v3
with:
java-version: adopt@1.11
distribution: 'zulu'
java-version: '11'
- name: Publish snapshots
env:
SONATYPE_USERNAME: '${{ secrets.SONATYPE_USER }}'
Expand Down
84 changes: 46 additions & 38 deletions .github/workflows/test.yml
Expand Up @@ -25,7 +25,7 @@ jobs:
name: Code format
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: scalafmt
run: ./sbt scalafmtCheckAll
- name: scalafmt in Scala 3
Expand All @@ -40,14 +40,15 @@ jobs:
name: Scala 2.12
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v11
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
java-version: zulu@1.17
distribution: 'temurin'
java-version: '17'
- name: Scala 2.12 test
run: ./sbt "++2.12; projectJVM/test"
- name: Publish Test Report
uses: mikepenz/action-junit-report@v2
uses: mikepenz/action-junit-report@v3
if: always() # always run even if the previous step fails
with:
report_paths: '**/target/test-reports/TEST-*.xml'
Expand All @@ -56,14 +57,15 @@ jobs:
name: Scala 2.13
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v11
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
java-version: zulu@1.17
distribution: 'temurin'
java-version: '17'
- name: Scala 2.13 test
run: ./sbt "++2.13; projectJVM/test"
- name: Publish Test Report
uses: mikepenz/action-junit-report@v2
uses: mikepenz/action-junit-report@v3
if: always() # always run even if the previous step fails
with:
report_paths: '**/target/test-reports/TEST-*.xml'
Expand All @@ -72,14 +74,15 @@ jobs:
name: Scala 2.13 + JDK11
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v11
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
java-version: zulu@1.11
distribution: 'zulu'
java-version: '11'
- name: Scala 2.13 + JDK11 test
run: ./sbt ++2.13 projectJVM/test
- name: Publish Test Report
uses: mikepenz/action-junit-report@v2
uses: mikepenz/action-junit-report@v3
if: always() # always run even if the previous step fails
with:
report_paths: '**/target/test-reports/TEST-*.xml'
Expand All @@ -88,15 +91,15 @@ jobs:
name: Scala 2.13 + JDK19
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '19'
- name: Scala 2.13 + JDK19 test
run: ./sbt ++2.13 projectJVM/test
- name: Publish Test Report
uses: mikepenz/action-junit-report@v2
uses: mikepenz/action-junit-report@v3
if: always() # always run even if the previous step fails
with:
report_paths: '**/target/test-reports/TEST-*.xml'
Expand All @@ -105,15 +108,16 @@ jobs:
name: Scala 3.x (Dotty)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v11
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
java-version: zulu@1.17
distribution: 'temurin'
java-version: '17'
- name: Scala 3.x test
# Test only Scala 3 supported projects
run: ./sbt "++ 3; projectDotty/test; dottyTest/run"
- name: Publish Test Report
uses: mikepenz/action-junit-report@v2
uses: mikepenz/action-junit-report@v3
if: always() # always run even if the previous step fails
with:
report_paths: '**/target/test-reports/TEST-*.xml'
Expand All @@ -122,19 +126,20 @@ jobs:
name: Scala.js / Scala 2.12
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v11
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
java-version: zulu@1.17
- uses: actions/setup-node@v2
distribution: 'temurin'
java-version: '17'
- uses: actions/setup-node@v3
with:
node-version: '16'
- name: Node.js setup
run: ./scripts/setup-scalajs.sh
- name: Scala.js test
run: JVM_OPTS=-Xmx4g ./sbt "++ 2.12; projectJS/test"
- name: Publish Test Report
uses: mikepenz/action-junit-report@v2
uses: mikepenz/action-junit-report@v3
if: always() # always run even if the previous step fails
with:
report_paths: '**/target/test-reports/TEST-*.xml'
Expand All @@ -143,19 +148,20 @@ jobs:
name: Scala.js / Scala 2.13
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v11
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
java-version: zulu@1.17
- uses: actions/setup-node@v2
distribution: 'temurin'
java-version: '17'
- uses: actions/setup-node@v3
with:
node-version: '16'
- name: Node.js setup
run: ./scripts/setup-scalajs.sh
- name: Scala.js test
run: JVM_OPTS=-Xmx4g ./sbt "++ 2.13; projectJS/test"
- name: Publish Test Report
uses: mikepenz/action-junit-report@v2
uses: mikepenz/action-junit-report@v3
if: always() # always run even if the previous step fails
with:
report_paths: '**/target/test-reports/TEST-*.xml'
Expand All @@ -164,19 +170,20 @@ jobs:
name: Scala.js / Scala 3
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v11
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
java-version: zulu@1.17
- uses: actions/setup-node@v2
distribution: 'temurin'
java-version: '17'
- uses: actions/setup-node@v3
with:
node-version: '16'
- name: Node.js setup
run: ./scripts/setup-scalajs.sh
- name: Scala.js test
run: JVM_OPTS=-Xmx4g ./sbt "++ 3; projectJS/test"
- name: Publish Test Report
uses: mikepenz/action-junit-report@v2
uses: mikepenz/action-junit-report@v3
if: always() # always run even if the previous step fails
with:
report_paths: '**/target/test-reports/TEST-*.xml'
Expand All @@ -185,15 +192,16 @@ jobs:
name: AirSpec
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: olafurpg/setup-scala@v11
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
java-version: zulu@1.17
distribution: 'temurin'
java-version: '17'
- name: Scala JVM and Scala.js Test
run: ../sbt "++airspecJVM/test; ++airspecJS/test"
working-directory: ./airspec
- name: Publish Test Report
uses: mikepenz/action-junit-report@v2
uses: mikepenz/action-junit-report@v3
if: always() # always run even if the previous step fails
with:
report_paths: '**/target/test-reports/TEST-*.xml'
Expand Down

0 comments on commit 0e8312c

Please sign in to comment.