Skip to content

Commit 04a3afc

Browse files
karamem0karamem0
committed
4.1.4 release
1 parent 0ff1f1d commit 04a3afc

File tree

106 files changed

+2856
-1696
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+2856
-1696
lines changed

‎.github/workflows/build-manifest.yml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
name: Build manifest
22

3-
on:
4-
workflow_call:
5-
inputs:
6-
environment:
7-
required: true
8-
type: string
3+
on: workflow_call
94

105
permissions: {}
116

127
jobs:
138
run:
149
name: Run
15-
environment: ${{inputs.environment}}
1610
runs-on: ubuntu-latest
1711
steps:
1812
- name: Checkout repos
@@ -21,8 +15,8 @@ jobs:
2115
shell: pwsh
2216
run: |
2317
$content = Get-Content -Path ${{env.FILE_PATH}}
24-
$content = $content -Replace '{{APP_CLIENT_ID}}', '${{vars.APP_CLIENT_ID}}'
25-
$content = $content -Replace '{{WEB_HOST_NAME}}', '${{vars.WEB_HOST_NAME}}'
18+
$content = $content -Replace '{{MICROSOFT_APP_ID}}', '${{vars.MICROSOFT_APP_ID}}'
19+
$content = $content -Replace '{{AZURE_WEB_APP_DOMAIN_NAME}}', '${{vars.AZURE_WEB_APP_DOMAIN_NAME}}'
2620
$content = $content -Replace "{{APP_VERSION}}", "${{vars.BUILD_VERSION}}"
2721
Out-File -FilePath ${{env.FILE_PATH}} -InputObject $content -Encoding UTF8
2822
env:

‎.github/workflows/build-source.yml‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,20 @@
11
name: Build source
22

3-
on:
4-
workflow_call:
5-
inputs:
6-
environment:
7-
required: true
8-
type: string
3+
on: workflow_call
94

105
permissions: {}
116

127
jobs:
138
run:
149
name: Run
15-
environment: ${{inputs.environment}}
1610
runs-on: ubuntu-latest
1711
steps:
1812
- name: Checkout repos
1913
uses: actions/checkout@v4
20-
- name: Setup Node.js 20.x
14+
- name: Setup Node.js 22.x
2115
uses: actions/setup-node@v4
2216
with:
23-
node-version: 20.x
17+
node-version: 22.x
2418
- name: Setup .NET Core
2519
uses: actions/setup-dotnet@v4
2620
with:
@@ -29,16 +23,15 @@ jobs:
2923
shell: pwsh
3024
run: |
3125
$content = Get-Content -Path ${{env.FILE_PATH}}
32-
$content = $content -Replace "{{APP_CLIENT_ID}}", "${{vars.APP_CLIENT_ID}}"
26+
$content = $content -Replace "{{MICROSOFT_APP_ID}}", "${{vars.MICROSOFT_APP_ID}}"
3327
Out-File -FilePath ${{env.FILE_PATH}} -InputObject $content -Encoding UTF8
3428
env:
3529
FILE_PATH: source/client/public/.well-known/microsoft-identity-association.json
3630
- name: Update .env
3731
shell: pwsh
3832
run: |
3933
$content = Get-Content -Path ${{env.FILE_PATH}}
40-
$content = $content -Replace "{{WEB_HOST_NAME}}", "${{vars.WEB_HOST_NAME}}"
41-
$content = $content -Replace "{{FUNCTION_HOST_NAME}}", "${{vars.FUNCTION_HOST_NAME}}"
34+
$content = $content -Replace "{{AZURE_FUNCTION_APP_DOMAIN_NAME}}", "${{vars.AZURE_FUNCTION_APP_DOMAIN_NAME}}"
4235
$content = $content -Replace "{{TELEMETRY_CONNECTION_STRING}}", "${{vars.TELEMETRY_CONNECTION_STRING}}"
4336
Out-File -FilePath ${{env.FILE_PATH}} -InputObject $content -Encoding UTF8
4437
env:

‎.github/workflows/deploy-to-azure.yml‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,12 @@
11
name: Deploy to Azure
22

3-
on:
4-
workflow_call:
5-
inputs:
6-
environment:
7-
required: true
8-
type: string
9-
slot-name:
10-
required: false
11-
type: string
3+
on: workflow_call
124

135
permissions: {}
146

157
jobs:
168
run:
179
name: Run
18-
environment: ${{inputs.environment}}
1910
runs-on: ubuntu-latest
2011
steps:
2112
- name: Download artifacts
@@ -31,11 +22,9 @@ jobs:
3122
uses: azure/webapps-deploy@de617f46172a906d0617bb0e50d81e9e3aec24c8
3223
with:
3324
app-name: ${{vars.AZURE_WEB_APP_NAME}}
34-
slot-name: ${{inputs.slot-name}}
3525
package: build/web
3626
- name: Deploy function
3727
uses: azure/webapps-deploy@de617f46172a906d0617bb0e50d81e9e3aec24c8
3828
with:
3929
app-name: ${{vars.AZURE_FUNCTION_APP_NAME}}
40-
slot-name: ${{inputs.slot-name}}
4130
package: build/function

‎.github/workflows/deploy-to-github-release.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: Deploy to GitHub Release
22

3-
on:
4-
workflow_call: {}
3+
on: workflow_call
54

65
permissions:
76
contents: write

‎.github/workflows/test-source.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: Test source
22

3-
on:
4-
workflow_call: {}
3+
on: workflow_call
54

65
permissions:
76
checks: write

‎.github/workflows/trigger-on-develop.yml‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎.github/workflows/trigger-on-main.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@ on:
55
branches:
66
- main
77

8-
permissions: {}
8+
permissions:
9+
checks: write
910

1011
jobs:
12+
test-source:
13+
name: Test source
14+
uses: ./.github/workflows/test-source.yml
15+
secrets: inherit
1116
build-source:
1217
name: Build source
18+
needs: test-source
1319
uses: ./.github/workflows/build-source.yml
1420
secrets: inherit
15-
with:
16-
environment: prd
1721
deploy-source:
1822
name: Deploy to Azure
1923
needs: build-source
2024
uses: ./.github/workflows/deploy-to-azure.yml
2125
secrets: inherit
22-
with:
23-
environment: prd
2426
build-manifest:
2527
name: Build manifest
2628
uses: ./.github/workflows/build-manifest.yml
2729
secrets: inherit
28-
with:
29-
environment: prd

‎.github/workflows/trigger-on-tags.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ jobs:
1313
name: Build manifest
1414
uses: ./.github/workflows/build-manifest.yml
1515
secrets: inherit
16-
with:
17-
environment: prd
1816
deploy-to-github-release:
1917
name: Deploy to GitHub Release
2018
needs: build-manifest

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
Commistant は Microsoft Teams 会議によるコミュニティ イベントをサポートするアシスタント ボットです。
44

55
[![.github/workflows/trigger-on-main.yml](https://github.com/karamem0/commistant/actions/workflows/trigger-on-main.yml/badge.svg)](https://github.com/karamem0/commistant/actions/workflows/trigger-on-main.yml)
6-
[![.github/workflows/trigger-on-develop.yml](https://github.com/karamem0/commistant/actions/workflows/trigger-on-develop.yml/badge.svg)](https://github.com/karamem0/commistant/actions/workflows/trigger-on-develop.yml)
76
[![codecov](https://codecov.io/gh/karamem0/commistant/graph/badge.svg?token=Z783SI7V9N)](https://codecov.io/gh/karamem0/commistant)
87
[![License](https://img.shields.io/github/license/karamem0/commistant.svg)](https://github.com/karamem0/commistant/blob/main/LICENSE)
98

‎manifest/manifest.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.17/MicrosoftTeams.schema.json",
3-
"manifestVersion": "1.17",
2+
"$schema": "https://developer.microsoft.com/en-us/json-schemas/teams/v1.22/MicrosoftTeams.schema.json",
3+
"manifestVersion": "1.22",
44
"version": "{{APP_VERSION}}",
5-
"id": "{{APP_CLIENT_ID}}",
5+
"id": "{{MICROSOFT_APP_ID}}",
66
"name": {
77
"short": "Commistant",
88
"full": "Commistant"
@@ -24,7 +24,7 @@
2424
"accentColor": "#ea5549",
2525
"configurableTabs": [
2626
{
27-
"configurationUrl": "https://{{WEB_HOST_NAME}}/tab/configure",
27+
"configurationUrl": "https://{{AZURE_WEB_APP_DOMAIN_NAME}}/tab/configure",
2828
"canUpdateConfiguration": false,
2929
"scopes": [
3030
"groupChat"
@@ -37,7 +37,7 @@
3737
],
3838
"bots": [
3939
{
40-
"botId": "{{APP_CLIENT_ID}}",
40+
"botId": "{{MICROSOFT_APP_ID}}",
4141
"scopes": [
4242
"groupChat"
4343
],
@@ -73,12 +73,12 @@
7373
}
7474
],
7575
"validDomains": [
76-
"{{WEB_HOST_NAME}}",
76+
"{{AZURE_WEB_APP_DOMAIN_NAME}}",
7777
"token.botframework.com"
7878
],
7979
"webApplicationInfo": {
80-
"id": "{{APP_CLIENT_ID}}",
81-
"resource": "api://{{WEB_HOST_NAME}}/{{APP_CLIENT_ID}}"
80+
"id": "{{MICROSOFT_APP_ID}}",
81+
"resource": "api://{{AZURE_WEB_APP_DOMAIN_NAME}}/{{MICROSOFT_APP_ID}}"
8282
},
8383
"authorization": {
8484
"permissions": {

0 commit comments

Comments
 (0)