Skip to content

Commit

Permalink
Merge branch 'main' into plone606
Browse files Browse the repository at this point in the history
  • Loading branch information
mamico authored Dec 11, 2023
2 parents 31c99be + 1b9d93a commit 7530124
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
curl --fail --request POST \
--form token=${{ secrets.TOKEN }} \
--form ref=main \
--form "variables[GITHUB_TAG]=$VERSION" \
--form "variables[GITHUB_TAG]=${{ env.VERSION }}" \
"https://gitlab.com/api/v4/projects/${{ secrets.PROJECT_ID }}/trigger/pipeline"
build-acceptance-image:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: docker/setup-buildx-action@v2

- name: Login to Registry
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
Expand Down

0 comments on commit 7530124

Please sign in to comment.