diff --git a/.circleci/config.yml b/.circleci/config.yml index c930e6163..e4ad193db 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ jobs: build: docker: # specify the version you desire here - - image: openjdk:17-jdk-slim + - image: openjdk:21-jdk-slim resource_class: large working_directory: ~/repo diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index b597c3c8a..a6006c5df 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -1,14 +1,14 @@ name: Galaxy Actions -on: [ push, pull_request, workflow_dispatch ] +on: [push, pull_request, workflow_dispatch] jobs: Build: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.gradle/caches @@ -18,16 +18,16 @@ jobs: restore-keys: | caches- - name: JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' - java-version: '17' + java-version: '21' - name: Gradle - uses: gradle/wrapper-validation-action@v1 + uses: gradle/actions/wrapper-validation@v3 - name: Build run: ./gradlew --no-daemon build - name: Upload-Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: jar path: build/libs/Galaxy.jar @@ -45,22 +45,22 @@ jobs: shell: bash run: echo IMAGE_TAG=$([ "$GITHUB_REF" = "refs/heads/master" ] && echo "latest" || ([ "$GITHUB_EVENT_NAME" = 'pull_request' ] && echo pr-${{github.event.pull_request.number}} || echo ${GITHUB_REF##*/})) >> $GITHUB_ENV - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Checkout submodules shell: bash run: | auth_header="$(git config --local --get http.https://github.com/.extraheader)" git submodule sync --recursive git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: jar path: docker/mods/Galaxy.jar - name: login if: env.USERNAME != '' && env.PASSWORD != '' - uses: azure/docker-login@v1 + uses: docker/login-action@v3 with: - login-server: harbor.k8s.oktw.one + registry: harbor.k8s.oktw.one username: ${{ secrets.OKTW_HARBOR_USERNAME }} password: ${{ secrets.OKTW_HARBOR_PASSWORD }} - name: build cache