diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 71e5db1d..b9bc6cc7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,18 +17,18 @@ jobs: if: startsWith(github.ref, 'dockerfile-image-update-') == false steps: - name: checkout - uses: actions/checkout@main + uses: actions/checkout@v4 with: ref: ${{ github.ref }} - name: docker build run: make mvn-docker-build get-main-project-dirs - name: Upload main module - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: dockerfile-image-update path: dockerfile-image-update - name: Upload itest module - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: dockerfile-image-update-itest path: dockerfile-image-update-itest @@ -39,7 +39,7 @@ jobs: version: ${{ steps.version_tag.outputs.new_version }} steps: - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: get version @@ -52,13 +52,14 @@ jobs: needs: [build-test, get-next-version] steps: - name: checkout - uses: actions/checkout@main + uses: actions/checkout@v4 with: ref: ${{ github.ref }} - name: Download itest dir - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: dockerfile-image-update-itest + path: dockerfile-image-update-itest - name: integration test env: ITEST_GH_TOKEN: ${{ secrets.ITEST_GH_TOKEN }} @@ -68,9 +69,10 @@ jobs: needs: build-test steps: - name: Download main project dir - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: dockerfile-image-update + path: dockerfile-image-update - name: Upload coverage to Codecov uses: codecov/codecov-action@v1.0.10 with: @@ -79,25 +81,3 @@ jobs: # flags: unittests # yml: ./codecov.yml fail_ci_if_error: true - codeclimate: - runs-on: ubuntu-latest - needs: build-test - steps: - - name: checkout - uses: actions/checkout@main - with: - ref: ${{ github.ref }} - - name: Download main project dir - uses: actions/download-artifact@v1 - with: - name: dockerfile-image-update - - name: Upload coverage to Code Climate - uses: paambaati/codeclimate-action@v2.6.0 - env: - CC_TEST_REPORTER_ID: 873529a2ad74a48f14a73b29dd3f392c7da63902534ac0fd224746f32ba77ac5 - JACOCO_SOURCE_PATH: "${{github.workspace}}/dockerfile-image-update/src/main/java" - with: - # The report file must be there, otherwise Code Climate won't find it - coverageCommand: echo "already done" - coverageLocations: | - ${{github.workspace}}/dockerfile-image-update/target/site/jacoco/jacoco.xml:jacoco diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 67d81db6..8ee30839 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,18 +7,18 @@ jobs: if: startsWith(github.ref, 'dockerfile-image-update-') == false steps: - name: checkout - uses: actions/checkout@main + uses: actions/checkout@v4 with: ref: ${{ github.ref }} - name: docker build run: make mvn-docker-build get-main-project-dirs - name: Upload main module - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: dockerfile-image-update path: dockerfile-image-update - name: Upload itest module - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: dockerfile-image-update-itest path: dockerfile-image-update-itest @@ -29,7 +29,7 @@ jobs: version: ${{ steps.version_tag.outputs.new_version }} steps: - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: get version @@ -42,13 +42,14 @@ jobs: needs: [build-test, get-next-version] steps: - name: checkout - uses: actions/checkout@main + uses: actions/checkout@v4 with: ref: ${{ github.ref }} - name: Download itest dir - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: dockerfile-image-update-itest + path: dockerfile-image-update-itest - name: integration test env: ITEST_GH_TOKEN: ${{ secrets.ITEST_GH_TOKEN }} @@ -59,13 +60,14 @@ jobs: if: github.ref == 'refs/heads/main' steps: - name: checkout - uses: actions/checkout@main + uses: actions/checkout@v4 with: ref: ${{ github.ref }} - name: Download main project dir - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: dockerfile-image-update + path: dockerfile-image-update - name: deploy env: encrypted_00fae8efff8c_iv: ${{ secrets.encrypted_00fae8efff8c_iv }} diff --git a/Dockerfile b/Dockerfile index da77768f..0c42f441 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ ARG JDK_VERSION -FROM openjdk:${JDK_VERSION}-jre-slim +FROM openjdk:${JDK_VERSION}-ea-slim ARG MVN_VERSION=1.1-SNAPSHOT ENV MVN_VERSION=${MVN_VERSION} diff --git a/Makefile b/Makefile index 466fafd1..79b60234 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ all: mvn-docker-build get-itest-jar-from-maven-image integration-test # JDK_VERSION should be the JDK version we use to source our container dependencies -JDK_VERSION=11 +JDK_VERSION=17 MVN_SNAPSHOT_VERSION=1.1-SNAPSHOT DFIU_DIR=dockerfile-image-update @@ -21,7 +21,7 @@ mvn-docker-build: #TODO: add --abort-on-container-exit to docker-compose once itests can be made not to flap see issue #21 integration-test: @-echo git_api_token=${ITEST_GH_TOKEN} > $(CURDIR)/itest.env - user_itest_secrets_file_secret=$(CURDIR)/itest.env docker-compose up + user_itest_secrets_file_secret=$(CURDIR)/itest.env docker compose up rm itest.env get-main-project-dirs: