Skip to content

Commit 04f6f5a

Browse files
committed
Merge remote-tracking branch 'official/master' into use-elmish
2 parents adee31f + 61b8777 commit 04f6f5a

File tree

8 files changed

+643
-855
lines changed

8 files changed

+643
-855
lines changed

.github/workflows/build-test.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,17 @@ jobs:
1212

1313
steps:
1414
- uses: actions/checkout@v4
15-
15+
1616
- name: Setup .NET
1717
uses: actions/setup-dotnet@v3
1818
with:
1919
dotnet-version: 8.0.x
20-
20+
2121
- name: Restore tools
22-
working-directory: ./update
2322
run: dotnet tool restore
2423

2524
- name: Test
26-
working-directory: ./update
2725
run: dotnet run devopstests
2826

2927
- name: Build
30-
working-directory: ./update
3128
run: dotnet run bundle

.github/workflows/deploy.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
name: Safe Bookstore deploy
22

33
on:
4-
push:
5-
branches:
6-
- master
4+
release:
5+
types: [published]
76

87
jobs:
98
deploy:
109
runs-on: ubuntu-latest
1110

1211
steps:
1312
- uses: actions/checkout@v4
14-
13+
1514
- name: Setup .NET
1615
uses: actions/setup-dotnet@v3
1716
with:
1817
dotnet-version: 8.0.x
19-
18+
2019
- name: Restore tools
2120
run: dotnet tool restore
2221

@@ -25,6 +24,8 @@ jobs:
2524

2625
- name: Build
2726
run: dotnet run bundle
27+
env:
28+
VITE_APP_VERSION: ${{ github.ref_name }}
2829

2930
- name: Azure Login
3031
uses: azure/login@v1

.paket/Paket.Restore.targets

+497-500
Large diffs are not rendered by default.

Build.fs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ let sharedTestsPath = Path.getFullName "tests/Shared"
1616
let serverTestsPath = Path.getFullName "tests/Server"
1717
let clientTestsPath = Path.getFullName "tests/Client"
1818

19-
let appName = "safebookstoret"
19+
let appName = "safebookstore"
2020
let storageAccountName = $"{appName}storage"
2121
let logAnalyticsName = $"{appName}-la"
2222
let appInsightsName = $"{appName}-ai"

0 commit comments

Comments
 (0)