Skip to content

Commit

Permalink
Merge remote-tracking branch 'official/master' into use-elmish
Browse files Browse the repository at this point in the history
  • Loading branch information
Larocceau committed Mar 8, 2024
2 parents adee31f + 61b8777 commit 04f6f5a
Show file tree
Hide file tree
Showing 8 changed files with 643 additions and 855 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,17 @@ jobs:

steps:
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 8.0.x

- name: Restore tools
working-directory: ./update
run: dotnet tool restore

- name: Test
working-directory: ./update
run: dotnet run devopstests

- name: Build
working-directory: ./update
run: dotnet run bundle
11 changes: 6 additions & 5 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
name: Safe Bookstore deploy

on:
push:
branches:
- master
release:
types: [published]

jobs:
deploy:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 8.0.x

- name: Restore tools
run: dotnet tool restore

Expand All @@ -25,6 +24,8 @@ jobs:

- name: Build
run: dotnet run bundle
env:
VITE_APP_VERSION: ${{ github.ref_name }}

- name: Azure Login
uses: azure/login@v1
Expand Down
997 changes: 497 additions & 500 deletions .paket/Paket.Restore.targets

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Build.fs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ let sharedTestsPath = Path.getFullName "tests/Shared"
let serverTestsPath = Path.getFullName "tests/Server"
let clientTestsPath = Path.getFullName "tests/Client"

let appName = "safebookstoret"
let appName = "safebookstore"
let storageAccountName = $"{appName}storage"
let logAnalyticsName = $"{appName}-la"
let appInsightsName = $"{appName}-ai"
Expand Down
Loading

0 comments on commit 04f6f5a

Please sign in to comment.