Skip to content

Commit

Permalink
Merge branch 'typescript' into typescript-docker
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/test-release.yml
  • Loading branch information
sebbo2002 committed Oct 21, 2023
2 parents 0d28a0f + 13ffe4e commit a98da9b
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/test-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,11 @@ jobs:
concurrency: release
env:
PUSH_TO_DOCKERHUB: ${{ (github.repository != 'sebbo2002/js-template') && (secrets.DOCKERHUB_TOKEN != null) }}
permissions:
contents: write
issues: write
pull-requests: write
id-token: write
needs:
- coverage
- tests
Expand Down Expand Up @@ -323,6 +328,7 @@ jobs:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
GH_OWNER: ${{ github.repository_owner }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
NPM_CONFIG_PROVENANCE: true
DOCKER_LOCAL_IMAGE_GH: ghcr.io/${{ github.repository }}:${{ github.sha }}
DOCKER_LOCAL_IMAGE_DH: ${{ github.repository }}:${{ github.sha }}
- name: 🔃 Merge main back into develop
Expand Down

0 comments on commit a98da9b

Please sign in to comment.