Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/mui/lab-5.0.0-alpha.153
Browse files Browse the repository at this point in the history
  • Loading branch information
erikvatt authored Nov 30, 2023
2 parents 2ef87d6 + eded6b9 commit 10dc5ed
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ jobs:
outputs:
image: ${{ steps.image.outputs.image }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: set Docker image name:tag
id: image
run: |
export IMAGE="ghcr.io/${{ github.repository }}:$(date '+%Y-%m-%d')-$(git --no-pager log -1 --pretty=%h)"
echo "IMAGE=$IMAGE" >> $GITHUB_ENV
echo ::set-output name=image::"$IMAGE"
- uses: docker/setup-buildx-action@v2
- uses: docker/setup-buildx-action@v3
- uses: actions/cache@v3
with:
path: /tmp/.buildx-cache
Expand All @@ -32,13 +32,13 @@ jobs:
${{ runner.os }}-buildx-
name: Build and push
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push Dockerimage
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
context: .
push: true
Expand All @@ -63,7 +63,7 @@ jobs:
env:
IMAGE: ${{ needs.build.outputs.image }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Deploy to dev
uses: nais/deploy/actions/deploy@v1
env:
Expand All @@ -77,7 +77,7 @@ jobs:
env:
IMAGE: ${{ needs.build.outputs.image }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Deploy to prod
if: github.ref == 'refs/heads/main'
uses: nais/deploy/actions/deploy@v1
Expand Down

0 comments on commit 10dc5ed

Please sign in to comment.