Skip to content

Commit

Permalink
merge to release (#240)
Browse files Browse the repository at this point in the history
  • Loading branch information
nam20485 committed Feb 22, 2024
2 parents 8a8d8e5 + ff02e37 commit 785fef8
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: Download Artifacts
uses: dawidd6/action-download-artifact@72aaadce3bc708349fc665eee3785cbb1b6e51d0 # v3.1.1
uses: dawidd6/action-download-artifact@71072fbb1229e1317f1a8de6b04206afb461bd67 # v3.1.2
with:
workflow: cmake-multi-platform.yml
workflow_conclusion: success
Expand Down
11 changes: 3 additions & 8 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
id: meta
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
env:
DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
#DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
CURRENT_DATETIME: ${{ env.CURRENT_DATETIME }}
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
cache-to: type=gha,mode=max
#platforms: linux/amd64
file: Dockerfile
annotations: ${{ steps.meta.outputs.annotations }}
#annotations: ${{ steps.meta.outputs.annotations }}
build-args: |
OWNER=nam20485
GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
Expand All @@ -147,9 +147,4 @@ jobs:
with:
repository: ${{ github.repository }}
event-type: trigger_deploy_release_event
client-payload: |
'{ \
"ref_name": "${{ github.ref_name }}", \
"run_number": "${{ github.run_number }}", \
"dispatch_id": "${{ secrets.DISPATCH_ID }}" \
}'
client-payload: '{ "ref_name": "${{ github.ref_name }}", "run_number": "${{ github.run_number }}", "dispatch_id": "${{ secrets.DISPATCH_ID }}" }'
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ OdbDesignServer/PyOdbDesignLib/_PyOdbDesignLib.pyd
/TEST_DATA.zip
deploy/kubeconfig
Dockerfile.commentedOut
scripts/create-release-invoker.js
2 changes: 1 addition & 1 deletion scripts/deploy.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ kubectl rollout status deployment/odbdesign-server-swaggerui-v1
#

# apply ingress manifest
kubectl apply -f deploy/kube/default-ingress.yaml
kubectl apply -f deploy/kube/local-ingress.yaml

0 comments on commit 785fef8

Please sign in to comment.