From 1dafd1c55910da221e96cbf4848b95ee5c12b15d Mon Sep 17 00:00:00 2001 From: Nepomuk Seiler Date: Mon, 20 Jan 2020 08:57:33 +0100 Subject: [PATCH 1/3] Enable docker for github actions, remove a bunch of travis jobs --- .github/workflows/debug-docker.yml | 16 ----------- .github/workflows/validate-pr.yml | 43 +++++++++++++++--------------- .travis.yml | 43 +----------------------------- 3 files changed, 22 insertions(+), 80 deletions(-) delete mode 100644 .github/workflows/debug-docker.yml diff --git a/.github/workflows/debug-docker.yml b/.github/workflows/debug-docker.yml deleted file mode 100644 index a1eaffa9a..000000000 --- a/.github/workflows/debug-docker.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Debug Docker - -on: - push: - branches: - - master - -jobs: - show-docker: - runs-on: ubuntu-latest - - steps: - - name: Show docker version - run: docker version - - name: Show docker --version - run: docker --version diff --git a/.github/workflows/validate-pr.yml b/.github/workflows/validate-pr.yml index 75abcd190..4d0ad0edb 100644 --- a/.github/workflows/validate-pr.yml +++ b/.github/workflows/validate-pr.yml @@ -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 "^validateDockerUnit" "^validateDocker" scripted-jlink: runs-on: ubuntu-latest @@ -291,4 +290,4 @@ jobs: with: java-version: zulu@1.8 - name: Validate - run: sbt validateWindows \ No newline at end of file + run: sbt validateWindows diff --git a/.travis.yml b/.travis.yml index e33f44449..3ffe17f28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,43 +53,9 @@ jobs: 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" + 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: | @@ -99,13 +65,6 @@ jobs: 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) From 8507b7061929047fb3d907d095ab7d4e2a1b757a Mon Sep 17 00:00:00 2001 From: Nepomuk Seiler Date: Mon, 20 Jan 2020 08:59:10 +0100 Subject: [PATCH 2/3] Fix indentation --- .github/workflows/validate-pr.yml | 40 +++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/validate-pr.yml b/.github/workflows/validate-pr.yml index 4d0ad0edb..06990ca29 100644 --- a/.github/workflows/validate-pr.yml +++ b/.github/workflows/validate-pr.yml @@ -180,26 +180,26 @@ jobs: - name: Validate run: sbt "^validateJdkPackagerTravis" - 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 "^validateDockerUnit" "^validateDocker" scripted-jlink: runs-on: ubuntu-latest From 16715c0e1a5099bba8dcec0fbe7073e620af66fc Mon Sep 17 00:00:00 2001 From: Nepomuk Seiler Date: Mon, 20 Jan 2020 10:40:45 +0100 Subject: [PATCH 3/3] Remove all travis checks --- .github/workflows/validate-pr.yml | 2 +- .travis.yml | 24 ------------------------ build.sbt | 1 - 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/.github/workflows/validate-pr.yml b/.github/workflows/validate-pr.yml index 06990ca29..8f76af431 100644 --- a/.github/workflows/validate-pr.yml +++ b/.github/workflows/validate-pr.yml @@ -199,7 +199,7 @@ jobs: with: java-version: zulu@1.8 - name: Validate - run: sbt "^validateDockerUnit" "^validateDocker" + run: sbt "^validateDocker" scripted-jlink: runs-on: ubuntu-latest diff --git a/.travis.yml b/.travis.yml index 3ffe17f28..56c3b9260 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,30 +52,6 @@ jobs: script: sbt "^validate" if: type = pull_request OR (type = push AND branch = master) - - stage: scripted - script: sbt "^validateDockerUnit" - name: "scripted docker unit-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: 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: diff --git a/build.sbt b/build.sbt index 4a6d843f4..6e150c835 100644 --- a/build.sbt +++ b/build.sbt @@ -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.