diff --git a/.github/find-hotfix-tags.sh b/.github/find-hotfix-tags.sh index 6ef6a4a..7733f40 100755 --- a/.github/find-hotfix-tags.sh +++ b/.github/find-hotfix-tags.sh @@ -40,4 +40,4 @@ cat dockerhub_tags build_candidate=$(comm -23 git_tags dockerhub_tags | head -n 1) echo "Found hotfix tag build candidate: $build_candidate" -echo "::set-output name=tag::$build_candidate" +echo "tag=$build_candidate" >> $GITHUB_OUTPUT diff --git a/.github/workflows/release-series-builds.yml b/.github/workflows/release-series-builds.yml index 2f6fa0f..e5ff367 100644 --- a/.github/workflows/release-series-builds.yml +++ b/.github/workflows/release-series-builds.yml @@ -24,10 +24,10 @@ jobs: osg_series: ['3.6'] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Cache base image - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: /tmp/.base-buildx-cache key: base-${{ matrix.osg_series}}-${{ matrix.repo }}-buildx-${{ github.sha }}-${{ github.run_id }} @@ -37,10 +37,10 @@ jobs: base-${{ matrix.osg_series }}-${{ matrix.repo }}-buildx- - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2.7.0 - name: Build Docker image - uses: docker/build-push-action@v2.2.2 + uses: docker/build-push-action@v4 with: context: . build-args: | @@ -61,25 +61,25 @@ jobs: osg_series: ['3.6'] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Load cached base image - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: /tmp/.base-buildx-cache key: base-${{ matrix.osg_series }}-${{ matrix.repo }}-buildx-${{ github.sha }}-${{ github.run_id }} - name: Cache child image - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: /tmp/.${{ matrix.image }}-buildx-cache key: ${{ matrix.image}}-${{matrix.osg_series }}-${{ matrix.repo}}-build-${{ github.sha}}-${{ github.run_id }} - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2.7.0 - name: Build Docker image - uses: docker/build-push-action@v2.2.2 + uses: docker/build-push-action@v4 with: context: . build-args: | @@ -100,25 +100,25 @@ jobs: repo: ['development', 'testing', 'release'] osg_series: ['3.6'] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Load stash-cache build cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: /tmp/.stash-cache-buildx-cache key: stash-cache-${{ matrix.osg_series }}-${{ matrix.repo}}-build-${{ github.sha}}-${{ github.run_id }} - name: Load stash-origin build cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: /tmp/.stash-origin-buildx-cache key: stash-origin-${{ matrix.osg_series }}-${{ matrix.repo}}-build-${{ github.sha}}-${{ github.run_id }} - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2.7.0 - name: Load stash-cache image - uses: docker/build-push-action@v2.2.2 + uses: docker/build-push-action@v4 with: context: . build-args: | @@ -130,7 +130,7 @@ jobs: cache-from: type=local,src=/tmp/.stash-cache-buildx-cache - name: Load stash-origin image - uses: docker/build-push-action@v2.2.2 + uses: docker/build-push-action@v4 with: context: . build-args: | @@ -152,7 +152,7 @@ jobs: steps: - name: make date tag id: mkdatetag - run: echo "::set-output name=dtag::$(date +%Y%m%d-%H%M)" + run: echo "dtag=$(date +%Y%m%d-%H%M)" >> $GITHUB_OUTPUT push-images: name: Push ${{ matrix.image }}:${{ matrix.osg_series }}-${{ matrix.repo }} image @@ -165,10 +165,10 @@ jobs: needs: [make-date-tag, test-stash-cache] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Load cached child image - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: /tmp/.${{ matrix.image }}-buildx-cache key: ${{ matrix.image}}-${{ matrix.osg_series }}-${{ matrix.repo}}-build-${{ github.sha}}-${{ github.run_id }} @@ -191,26 +191,26 @@ jobs: # This causes the tag_list array to be comma-separated below, # which is required for build-push-action IFS=, - echo "::set-output name=taglist::${tag_list[*]}" + echo "taglist=${tag_list[*]}" >> $GITHUB_OUTPUT - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2.7.0 - name: Log in to Docker Hub - uses: docker/login-action@v1 + uses: docker/login-action@v2.2.0 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Log in to OSG Harbor - uses: docker/login-action@v1 + uses: docker/login-action@v2.2.0 with: registry: hub.opensciencegrid.org username: ${{ secrets.OSG_HARBOR_ROBOT_USER }} password: ${{ secrets.OSG_HARBOR_ROBOT_PASSWORD }} - name: Build ${{ matrix.image}} image - uses: docker/build-push-action@v2.2.2 + uses: docker/build-push-action@v4 with: context: . push: True