diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml index 3858ae10..dfddca23 100644 --- a/.github/workflows/ci-docker.yml +++ b/.github/workflows/ci-docker.yml @@ -205,9 +205,20 @@ jobs: # get branch name BRANCH=${GITHUB_HEAD_REF} + RELEASE=false + if [ -z "$BRANCH" ]; then echo "This is a PUSH event" BRANCH=${{ github.ref_name }} + COMMIT=${{ github.sha }} + CLONE_URL=${{ github.event.repository.clone_url }} + if [[ $BRANCH == "master" ]]; then + RELEASE=true + fi + else + echo "This is a PULL REQUEST event" + COMMIT=${{ github.event.pull_request.head.sha }} + CLONE_URL=${{ github.event.pull_request.head.repo.clone_url }} fi # determine to push image to dockerhub and ghcr or not @@ -220,7 +231,6 @@ jobs: # setup the tags REPOSITORY=${{ github.repository }} BASE_TAG=$(echo $REPOSITORY | tr '[:upper:]' '[:lower:]') - COMMIT=${{ github.sha }} TAGS="${BASE_TAG}:${COMMIT:0:7}${{ matrix.tag }},ghcr.io/${BASE_TAG}:${COMMIT:0:7}${{ matrix.tag }}" @@ -277,6 +287,8 @@ jobs: echo "branch=${BRANCH}" >> $GITHUB_OUTPUT echo "build_date=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT echo "commit=${COMMIT}" >> $GITHUB_OUTPUT + echo "clone_url=${CLONE_URL}" >> $GITHUB_OUTPUT + echo "release=${RELEASE}" >> $GITHUB_OUTPUT echo "artifacts=${ARTIFACTS}" >> $GITHUB_OUTPUT echo "platforms=${PLATFORMS}" >> $GITHUB_OUTPUT echo "push=${PUSH}" >> $GITHUB_OUTPUT @@ -328,6 +340,8 @@ jobs: BUILD_DATE=${{ steps.prepare.outputs.build_date }} BUILD_VERSION=${{ needs.check_changelog.outputs.next_version }} COMMIT=${{ steps.prepare.outputs.commit }} + CLONE_URL=${{ steps.prepare.outputs.clone_url }} + RELEASE=${{ steps.prepare.outputs.release }} tags: ${{ steps.prepare.outputs.tags }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache @@ -345,6 +359,12 @@ jobs: BUILD_DATE=${{ steps.prepare.outputs.build_date }} BUILD_VERSION=${{ needs.check_changelog.outputs.next_version }} COMMIT=${{ steps.prepare.outputs.commit }} + CLONE_URL=${{ steps.prepare.outputs.clone_url }} + RELEASE=${{ steps.prepare.outputs.release }} + secrets: | + "AUR_EMAIL=${{ secrets.AUR_EMAIL }}" + "AUR_SSH_PRIVATE_KEY=${{ secrets.AUR_SSH_PRIVATE_KEY }}" + "AUR_USERNAME=${{ secrets.AUR_USERNAME }}" tags: ${{ steps.prepare.outputs.tags }} cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache