From 6450b73d809d2ef629ba97c52c05a45ca3ede76b Mon Sep 17 00:00:00 2001 From: Evgeny Mandrikov <138671+Godin@users.noreply.github.com> Date: Wed, 31 Jan 2024 16:39:46 +0100 Subject: [PATCH] Replace AppVeyor by GitHub Actions (#1572) --- .appveyor.yml | 17 -------- .github/workflows/ci.yml | 44 ++++++++++++++++++++- .travis/appveyor-toolchains.xml | 17 -------- README.md | 1 - org.jacoco.doc/docroot/doc/environment.html | 7 ++-- 5 files changed, 46 insertions(+), 40 deletions(-) delete mode 100644 .appveyor.yml delete mode 100644 .travis/appveyor-toolchains.xml diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 9b36f8e7a3..0000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,17 +0,0 @@ -cache: - - C:\Users\appveyor\.m2 -> **\pom.xml - -install: - - mkdir .jdk - - curl -L "https://api.azul.com/zulu/download/community/v1.0/bundles/latest/binary/?jdk_version=17&ext=zip&os=windows&arch=x86&hw_bitness=64&javafx=false&bundle_type=jdk" -o .jdk/jdk.zip - - unzip -d .jdk .jdk/jdk.zip - - mv .jdk/*/* .jdk - - .jdk\bin\java -version - - SET JAVA_HOME=%CD%\.jdk - -build_script: - # generation of Javadocs requires Java <= 6 (https://github.com/jacoco/jacoco/issues/110) - - mvn -V -B -e verify -Djdk.version=6 -Dbytecode.version=5 --toolchains=.travis\appveyor-toolchains.xml - -artifacts: - - path: jacoco\target\*.zip diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 53a4032cb1..65ecae7ce1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ on: - push - pull_request jobs: - build: + Linux: strategy: fail-fast: false matrix: @@ -46,3 +46,45 @@ jobs: mvn -V -B -e \ verify -Djdk.version=${{ matrix.jdk }} -Dbytecode.version=${{ matrix.jdk }} \ --toolchains=toolchains.xml + Windows: + runs-on: windows-2022 + steps: + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + - uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0 + with: + distribution: 'zulu' + java-version: | + 6 + 17 + - name: 'Generate toolchains.xml' + env: + JDK_VERSION: 6 + JDK_HOME_VARIABLE_NAME: JAVA_HOME_6_X64 + shell: bash + run: | + echo " + + + jdk + + $JDK_VERSION + $JDK_VERSION + + + ${!JDK_HOME_VARIABLE_NAME} + + + + " > toolchains.xml + - name: 'Build' + shell: bash + run: | + mvn -V -B -e \ + verify -Djdk.version=6 -Dbytecode.version=5 \ + --toolchains=toolchains.xml + - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0 + id: artifact-upload-step + with: + name: jacoco + path: jacoco/target/*.zip + if-no-files-found: error diff --git a/.travis/appveyor-toolchains.xml b/.travis/appveyor-toolchains.xml deleted file mode 100644 index 79fae7dd98..0000000000 --- a/.travis/appveyor-toolchains.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - jdk - - java16 - 6 - oracle - - - C:\Program Files\Java\jdk1.6.0 - - - - diff --git a/README.md b/README.md index 37ea54b772..03681b257f 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ JaCoCo Java Code Coverage Library ================================= [![Build Status](https://dev.azure.com/jacoco-org/JaCoCo/_apis/build/status/JaCoCo?branchName=master)](https://dev.azure.com/jacoco-org/JaCoCo/_build/latest?definitionId=1&branchName=master) -[![Build status](https://ci.appveyor.com/api/projects/status/g28egytv4tb898d7/branch/master?svg=true)](https://ci.appveyor.com/project/JaCoCo/jacoco/branch/master) [![Maven Central](https://img.shields.io/maven-central/v/org.jacoco/jacoco.svg)](http://search.maven.org/#search|ga|1|g%3Aorg.jacoco) JaCoCo is a free Java code coverage library distributed under the Eclipse Public diff --git a/org.jacoco.doc/docroot/doc/environment.html b/org.jacoco.doc/docroot/doc/environment.html index e556d2b92c..74e6447819 100644 --- a/org.jacoco.doc/docroot/doc/environment.html +++ b/org.jacoco.doc/docroot/doc/environment.html @@ -89,7 +89,6 @@

Continuous Integration

@@ -108,10 +107,10 @@

Development Build Artifacts

  • Master: The current master is available through the Maven snapshot repository.
  • Pull Requests: For every pull request the - AppVeyor builds + GitHub Actions builds provide the corresponding all-in-one zip for download. To access the - artifacts follow the check continuous-integration/appveyor/branch - on the corresponding GitHub pull request page.
  • + artifacts go to a summary page of a workflow run corresponding to the pull + request.

    Continuous Inspection