From 2837c6df59a64bc4dfb2f015df1bbd85af3a34c5 Mon Sep 17 00:00:00 2001 From: Rawi01 Date: Wed, 1 Mar 2023 21:58:58 +0100 Subject: Update ant.yml --- .github/workflows/ant.yml | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml index c3c4689b..356ea75f 100644 --- a/.github/workflows/ant.yml +++ b/.github/workflows/ant.yml @@ -60,22 +60,13 @@ jobs: with: java-version: ${{ matrix.jdk }} distribution: 'zulu' - - - name: Set up Ant - id: sdkman - uses: sdkman/sdkman-action@master - with: - candidate: ant - version: 1.10.13 - - -name: Install Ant - run: | - wget https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.13-bin.zip - unzip apache-ant-1.10.13-bin.zip -d "${HOME}" - echo "${ANT_HOME}=${HOME}/apache-ant-1.10.13" >> $GITHUB_ENV - echo "${ANT_HOME}/bin" >> $GITHUB_PATH - cd $ANT_HOME - ant -f fetch.xml -Ddest=system + + - name: Install Ant + run: | + wget https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.13-bin.zip + unzip apache-ant-1.10.13-bin.zip -d "${HOME}" + echo "ANT_HOME=${HOME}/apache-ant-1.10.13" >> $GITHUB_ENV + echo "${HOME}/apache-ant-1.10.13/bin" >> $GITHUB_PATH - name: Cache dependencies uses: actions/cache@v3 @@ -89,14 +80,10 @@ jobs: - name: Run tests run: ant -noinput test.${{ matrix.goal }} - - - + test-eclipse: runs-on: ubuntu-latest needs: build - env: - SWT_GTK3: 0 strategy: matrix: version: @@ -133,7 +120,7 @@ jobs: ${{ runner.os }}- - name: Build with Ant - run: ant -noinput dist test.${{ matrix.version }} + run: xvfb-run ant -noinput dist test.${{ matrix.version }} docker-integration-test: runs-on: ubuntu-latest @@ -163,4 +150,4 @@ jobs: run: docker build --build-arg jdk=${{ matrix.jdk }} -t $IMAGE_NAME -f ${{ matrix.tool.name }}/Dockerfile . - name: Compile in container - run: docker run --entrypoint="" -v $(pwd)/lombok.jar:/workspace/lombok.jar $IMAGE_NAME /bin/bash -c "cd classpath; ${{ matrix.tool.cmd }}" \ No newline at end of file + run: docker run --entrypoint="" -v $(pwd)/lombok.jar:/workspace/lombok.jar $IMAGE_NAME /bin/bash -c "cd classpath; ${{ matrix.tool.cmd }}" -- cgit