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

Enable docker for github actions, remove a bunch of travis jobs #1298

Merged
merged 3 commits into from
Jan 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 0 additions & 16 deletions .github/workflows/debug-docker.yml

This file was deleted.

43 changes: 21 additions & 22 deletions .github/workflows/validate-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,27 +180,26 @@ jobs:
- name: Validate
run: sbt "^validateJdkPackagerTravis"

# FIXME github actions uses docker 3.0.8, which is too old for native-packager
# scripted-docker:
# runs-on: ubuntu-latest
# strategy:
# fail-fast: false
# needs: [ validate ]
# steps:
# - uses: actions/checkout@v1
# - name: Loading ivy cache
# uses: actions/cache@v1
# with:
# path: ~/.ivy2/cache
# key: ${{ runner.os }}-ivy-${{ hashFiles('**/*.sbt') }}
# restore-keys: |
# ${{ runner.os }}-ivy-
# - name: Set up Azul JDK 1.8 and SBT
# uses: olafurpg/setup-scala@v7
# with:
# java-version: zulu@1.8
# - name: Validate
# run: sbt "^validateDockerUnit" "^validateDocker"
scripted-docker:
runs-on: ubuntu-latest
strategy:
fail-fast: false
needs: [ validate ]
steps:
- uses: actions/checkout@v1
- name: Loading ivy cache
uses: actions/cache@v1
with:
path: ~/.ivy2/cache
key: ${{ runner.os }}-ivy-${{ hashFiles('**/*.sbt') }}
restore-keys: |
${{ runner.os }}-ivy-
- name: Set up Azul JDK 1.8 and SBT
uses: olafurpg/setup-scala@v7
with:
java-version: zulu@1.8
- name: Validate
run: sbt "^validateDocker"

scripted-jlink:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -291,4 +290,4 @@ jobs:
with:
java-version: zulu@1.8
- name: Validate
run: sbt validateWindows
run: sbt validateWindows
65 changes: 0 additions & 65 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,71 +52,6 @@ jobs:
script: sbt "^validate"
if: type = pull_request OR (type = push AND branch = master)

- stage: scripted
script: sbt "^validateUniversal"
if: type = pull_request OR (type = push AND branch = master)
name: "scripted universal tests"
- script: |
$JABBA_HOME/bin/jabba install graalvm@19.0.0
export JAVA_HOME="$JABBA_HOME/jdk/graalvm@19.0.0" && export PATH="$JAVA_HOME/bin:$PATH" && java -version
gu install native-image
sbt "^validateGraalVMNativeImage"
if: type = pull_request OR (type = push AND branch = master)
services: docker
name: "scripted GraalVM native-image tests"
- script: sbt "^validateJar"
name: "scripted jar tests"
if: type = pull_request OR (type = push AND branch = master)
- script: sbt "^validateBash"
name: "scripted bash tests"
if: type = pull_request OR (type = push AND branch = master)
- script: sbt "^validateAsh"
name: "scripted ash tests"
if: type = pull_request OR (type = push AND branch = master)
- script: sbt "^validateRpm"
name: "scripted rpm tests"
if: type = pull_request OR (type = push AND branch = master)
- script: sbt "^validateDebian"
name: "scripted debian tests"
if: type = pull_request OR (type = push AND branch = master)
- script: sbt "^validateDockerUnit"
name: "scripted docker unit-tests"
if: type = pull_request OR (type = push AND branch = master)
# below will install ZuluFX OpenJFX
- script: |
wget https://cdn.azul.com/zulu/bin/zulu8.38.0.13-ca-fx-jdk8.0.212-linux_x64.tar.gz
tar -xvf zulu8.38.0.13-ca-fx-jdk8.0.212-linux_x64.tar.gz -C $JAVA_HOME --strip 1
rm zulu8.38.0.13-ca-fx-jdk8.0.212-linux_x64.tar.gz
sbt "^validateJdkPackagerTravis"
name: "scripted jdk-packager tests"
if: type = pull_request OR (type = push AND branch = master)
# docker configuration as described in
# https://docs.travis-ci.com/user/docker/
- script: |
export TRAVIS_JDK=zulu@1.11.0-2
$JABBA_HOME/bin/jabba install $TRAVIS_JDK
export JAVA_HOME="$JABBA_HOME/jdk/$TRAVIS_JDK" && export PATH="$JAVA_HOME/bin:$PATH" && java -version
sbt "^validateJlink"
name: "scripted jlink tests"
if: type = pull_request OR (type = push AND branch = master)
- script: |
export TRAVIS_JDK=zulu@1.12.0-1
$JABBA_HOME/bin/jabba install $TRAVIS_JDK
export JAVA_HOME="$JABBA_HOME/jdk/$TRAVIS_JDK" && export PATH="$JAVA_HOME/bin:$PATH" && java -version
sbt "^validateJlink"
name: "scripted jlink tests"
if: type = pull_request OR (type = push AND branch = master)
- script: sbt "^validateDocker"
name: "scripted docker integration-tests"
if: type = pull_request OR (type = push AND branch = master)
services: docker
sudo: required
- script: sbt "^validateOSX"
name: "scripted osx tests"
if: type = pull_request OR (type = push AND branch = master)
os: osx
osx_image: xcode8

- stage: release
python: 3.6
script:
Expand Down
1 change: 0 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ addCommandAlias("validateGraalVMNativeImage", "scripted graalvm-native-image/*")
addCommandAlias("validateRpm", "scripted rpm/*")
addCommandAlias("validateDebian", "scripted debian/*")
addCommandAlias("validateDocker", "scripted docker/*")
addCommandAlias("validateDockerUnit", "scripted docker/staging docker/entrypoint docker/ports docker/volumes")
addCommandAlias("validateJdkPackager", "scripted jdkpackager/*")
// travis ci's jdk8 version doesn't support nested association elements.
// error: Caused by: class com.sun.javafx.tools.ant.Info doesn't support the nested "association" element.
Expand Down