Skip to content

Commit

Permalink
Merge branch 'main' into andrueastman/pythonFix
Browse files Browse the repository at this point in the history
  • Loading branch information
andrueastman authored Nov 13, 2024
2 parents ca30d7a + d8f463a commit bb2b705
Show file tree
Hide file tree
Showing 7 changed files with 153 additions and 150 deletions.
12 changes: 12 additions & 0 deletions .github/workflows/build-vscode-extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,18 @@ permissions:
contents: read

jobs:
checksecret:
name: check if SONAR_TOKEN is set in github secrets
runs-on: ubuntu-latest
outputs:
is_SONAR_TOKEN_set: ${{ steps.checksecret_job.outputs.is_SONAR_TOKEN_set }}
steps:
- name: Check whether unity activation requests should be done
id: checksecret_job
run: |
echo "is_SONAR_TOKEN_set=${{ env.SONAR_TOKEN != '' }}" >> $GITHUB_OUTPUT
build_extension:
needs: [checksecret]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -40,6 +51,7 @@ jobs:
run: npm run test-with-coverage
working-directory: vscode/microsoft-kiota
- name: Run sonar cloud analysis
if: needs.checksecret.outputs.is_SONAR_TOKEN_set == 'true'
uses: SonarSource/sonarcloud-github-action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
Expand Down
14 changes: 7 additions & 7 deletions it/python/requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -98,19 +98,19 @@ httpx[http2]==0.27.2

hyperframe==6.0.1 ; python_full_version >= '3.6.1'

microsoft-kiota-abstractions==1.6.1
microsoft-kiota-abstractions==1.6.2

microsoft-kiota-authentication-azure==1.6.1
microsoft-kiota-authentication-azure==1.6.2

microsoft-kiota-http==1.6.1
microsoft-kiota-http==1.6.2

microsoft-kiota-serialization-json==1.6.1
microsoft-kiota-serialization-json==1.6.2

microsoft-kiota-serialization-text==1.6.1
microsoft-kiota-serialization-text==1.6.2

microsoft-kiota-serialization-form==1.6.1
microsoft-kiota-serialization-form==1.6.2

microsoft-kiota-serialization-multipart==1.6.1
microsoft-kiota-serialization-multipart==1.6.2

msal==1.31.0

Expand Down
156 changes: 78 additions & 78 deletions it/typescript/package-lock.json

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

18 changes: 9 additions & 9 deletions it/typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"@es-exec/esbuild-plugin-start": "^0.0.5",
"@stylistic/eslint-plugin-ts": "^2.10.1",
"@types/node": "^22.9.0",
"@typescript-eslint/eslint-plugin": "^8.13.0",
"@typescript-eslint/parser": "^8.13.0",
"@typescript-eslint/eslint-plugin": "^8.14.0",
"@typescript-eslint/parser": "^8.14.0",
"esbuild": "^0.24.0",
"eslint": "^9.14.0",
"eslint-config-prettier": "^9.1.0",
Expand All @@ -32,13 +32,13 @@
},
"dependencies": {
"@azure/identity": "^4.5.0",
"@microsoft/kiota-abstractions": "^1.0.0-preview.74",
"@microsoft/kiota-authentication-azure": "^1.0.0-preview.74",
"@microsoft/kiota-http-fetchlibrary": "^1.0.0-preview.74",
"@microsoft/kiota-serialization-form": "^1.0.0-preview.74",
"@microsoft/kiota-serialization-json": "^1.0.0-preview.74",
"@microsoft/kiota-serialization-multipart": "^1.0.0-preview.74",
"@microsoft/kiota-serialization-text": "^1.0.0-preview.74",
"@microsoft/kiota-abstractions": "^1.0.0-preview.75",
"@microsoft/kiota-authentication-azure": "^1.0.0-preview.75",
"@microsoft/kiota-http-fetchlibrary": "^1.0.0-preview.75",
"@microsoft/kiota-serialization-form": "^1.0.0-preview.75",
"@microsoft/kiota-serialization-json": "^1.0.0-preview.75",
"@microsoft/kiota-serialization-multipart": "^1.0.0-preview.75",
"@microsoft/kiota-serialization-text": "^1.0.0-preview.75",
"express": "^5.0.1",
"node-fetch": "^2.7.0"
}
Expand Down
Loading

0 comments on commit bb2b705

Please sign in to comment.