Skip to content

Commit

Permalink
Merge branch 'main' into andrueastman/Simports
Browse files Browse the repository at this point in the history
  • Loading branch information
andrueastman authored Jul 3, 2024
2 parents 517bb16 + 8dc240c commit 273309a
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 56 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
- name: Push to GitHub Packages - Nightly
if: contains(github.ref, env.PREVIEW_BRANCH)
uses: docker/build-push-action@v6.2.0
uses: docker/build-push-action@v6.3.0
with:
push: true
platforms: linux/amd64,linux/arm64/v8,linux/arm/v7
Expand All @@ -84,7 +84,7 @@ jobs:
# we can't get the sequence number from ADO so we default it back to github run number
- name: Push to GitHub Packages - Release
if: contains(github.ref, 'refs/tags/v')
uses: docker/build-push-action@v6.2.0
uses: docker/build-push-action@v6.3.0
with:
push: true
platforms: linux/amd64,linux/arm64/v8,linux/arm/v7
Expand Down
97 changes: 44 additions & 53 deletions vscode/microsoft-kiota/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vscode/microsoft-kiota/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@
"@vscode/test-electron": "^2.4.0",
"eslint": "^8.57.0",
"glob": "^10.4.2",
"mocha": "^10.5.2",
"mocha": "^10.6.0",
"ts-loader": "^9.5.1",
"typescript": "^5.5.3",
"webpack": "^5.92.1",
Expand Down

0 comments on commit 273309a

Please sign in to comment.