Skip to content

Commit

Permalink
Merge branch 'main' into x/sio-fix-sample
Browse files Browse the repository at this point in the history
  • Loading branch information
vicancy authored Dec 13, 2024
2 parents 5e49149 + d783385 commit 208b20d
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 6 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,9 @@ jobs:
javascript:
name: Build and Test JS code and samples
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
dotnet-version: [6.x]
steps:
- uses: actions/checkout@v4

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/deploy-demo-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ permissions:
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
publish:
name: Deploy demo website
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/integration-tests-csharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ on:

jobs:
test:
name: Integration tests for C#
runs-on: ubuntu-latest
env:
WEB_PUBSUB_CONNECTION_STRING: ${{ github.event.inputs.web_pubsub_connection_string || secrets.WEB_PUBSUB_CONNECTION_STRING }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/integration-tests-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ on:

jobs:
test:
name: Integration tests for Java
runs-on: ubuntu-latest
env:
WEB_PUBSUB_CONNECTION_STRING: ${{ github.event.inputs.web_pubsub_connection_string || secrets.WEB_PUBSUB_CONNECTION_STRING }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/integration-tests-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ on:

jobs:
test:
name: Integration tests for JS
runs-on: ubuntu-latest
env:
WEB_PUBSUB_CONNECTION_STRING: ${{ github.event.inputs.web_pubsub_connection_string || secrets.WEB_PUBSUB_CONNECTION_STRING }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/integration-tests-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ on:

jobs:
test:
name: Integration tests for Python
runs-on: ubuntu-latest
env:
WEB_PUBSUB_CONNECTION_STRING: ${{ github.event.inputs.web_pubsub_connection_string || secrets.WEB_PUBSUB_CONNECTION_STRING }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release_admin_ui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:

jobs:
build_pack_upload:
name: Release Socket.IO Admin UI
runs-on: ubuntu-latest
defaults:
run:
Expand All @@ -38,7 +39,7 @@ jobs:
echo "filename=azure-socketio-admin-ui-${package_version}" >> $GITHUB_OUTPUT
- name: Upload to Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ steps.metadata_step.outputs.filename }}
path: tools/azure-socketio-admin-ui/dist
4 changes: 2 additions & 2 deletions .github/workflows/release_extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:

jobs:
build_pack_upload:
name: Release VSCode Extension
runs-on: ubuntu-latest
defaults:
run:
Expand All @@ -38,10 +39,9 @@ jobs:
echo "vsix_filename=$(ls *.vsix)" >> $GITHUB_OUTPUT
- name: Upload to Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ steps.metadata_step.outputs.vsix_filename }}
path: tools/vscode-azurewebpubsub/${{ steps.metadata_step.outputs.vsix_filename }}
compression-level: 0 # no compression

# TODO: release to npm
2 changes: 2 additions & 0 deletions .github/workflows/release_socketio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ on:
- 'sdk/webpubsub-socketio-extension/CHANGELOG.md'
jobs:
release:
name: Release Azure SocketIO package
uses: ./.github/workflows/workflow-call-release-package.yml
secrets:
AZURESDKPARTNERDROPS_URL: ${{ secrets.AZURESDKPARTNERDROPS_URL }}
AZURESDKPARTNERDROPS_CLIENT_ID: ${{ secrets.AZURESDKPARTNERDROPS_CLIENT_ID }}
AZURESDKPARTNERDROPS_SUBSCRIPTION_ID: ${{ secrets.AZURESDKPARTNERDROPS_SUBSCRIPTION_ID }}
AZURESDKPARTNERDROPS_TENANT_ID: ${{ secrets.AZURESDKPARTNERDROPS_TENANT_ID }}
GH_PAT: ${{ secrets.GH_PAT }}
with:
package_name: webpubsub-socketio-extension
package_folder: sdk/webpubsub-socketio-extension
1 change: 1 addition & 0 deletions .github/workflows/release_tunnel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
- 'tools/awps-tunnel/server/CHANGELOG.md'
jobs:
release:
name: Release awps-tunnel package
uses: ./.github/workflows/workflow-call-release-package.yml
secrets:
AZURESDKPARTNERDROPS_URL: ${{ secrets.AZURESDKPARTNERDROPS_URL }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/socketio_e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ env:
NODE_VERSION: '18.x' # set this to the node version to use
jobs:
build:
name: Socket.IO E2E tests
runs-on: ubuntu-latest
timeout-minutes: 15
strategy:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tranalate-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:

jobs:
check-and-translate:
name: Translate tests with DeepPrompt
runs-on: ubuntu-latest
if: github.event.review.state == 'approved'

Expand Down

0 comments on commit 208b20d

Please sign in to comment.