Skip to content

Commit 7134380

Browse files
authored
Merge pull request #193 from valor-software/development
Release October 27
2 parents 882e005 + 0a1f410 commit 7134380

408 files changed

Lines changed: 32487 additions & 23194 deletions

File tree

Some content is hidden

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

.github/workflows/on-deploy.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-latest
2424
steps:
2525
- name: Cancel Previous Runs
26-
uses: styfle/cancel-workflow-action@0.9.0
26+
uses: styfle/cancel-workflow-action@0.11.0
2727
with:
2828
access_token: ${{ secrets.GITHUB_TOKEN }}
2929

@@ -32,29 +32,29 @@ jobs:
3232
runs-on: ubuntu-latest
3333
needs: one_run
3434
steps:
35-
- uses: actions/checkout@v2
36-
- uses: actions/setup-node@v2
35+
- uses: actions/checkout@v3
36+
- uses: actions/setup-node@v3
3737
with:
38-
node-version: '14.17.0'
39-
- uses: actions/cache@v2
38+
node-version: '16.15.1'
39+
- uses: actions/cache@v3
4040
id: cache
4141
with:
4242
path: ${{ env.CACHE_NODE_MODULES_PATH }}
4343
key: node_modules-${{ hashFiles('**/package-lock.json') }}
44-
- run: npm ci
44+
- run: yarn install --immutable --immutable-cache --check-cache
4545
if: steps.cache.outputs.cache-hit != 'true'
4646

4747
# build valor-software-site-base
4848
build:
4949
needs: install
5050
runs-on: ubuntu-latest
5151
steps:
52-
- uses: actions/checkout@v2
53-
- uses: actions/cache@v2
52+
- uses: actions/checkout@v3
53+
- uses: actions/cache@v3
5454
with:
5555
path: ${{ env.CACHE_NODE_MODULES_PATH }}
5656
key: node_modules-${{ hashFiles('**/package-lock.json') }}
57-
- uses: actions/cache@v2
57+
- uses: actions/cache@v3
5858
with:
5959
path: ${{ env.CACHE_DIST_PATH }}
6060
key: dist-${{ github.run_id }}
@@ -67,8 +67,8 @@ jobs:
6767
runs-on: ubuntu-latest
6868
needs: build
6969
steps:
70-
- uses: actions/checkout@v2
71-
- uses: actions/cache@v2
70+
- uses: actions/checkout@v3
71+
- uses: actions/cache@v3
7272
with:
7373
path: ${{ env.CACHE_DIST_PATH }}
7474
key: dist-${{ github.run_id }}

.github/workflows/on-push-or-pull.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: Cancel Previous Runs
25-
uses: styfle/cancel-workflow-action@0.9.0
25+
uses: styfle/cancel-workflow-action@0.11.0
2626
with:
2727
access_token: ${{ secrets.GITHUB_TOKEN }}
2828

@@ -31,32 +31,32 @@ jobs:
3131
runs-on: ubuntu-latest
3232
needs: one_run
3333
steps:
34-
- uses: actions/checkout@v2
35-
- uses: actions/setup-node@v2
34+
- uses: actions/checkout@v3
35+
- uses: actions/setup-node@v3
3636
with:
37-
node-version: '14.17.0'
38-
- uses: actions/cache@v2
37+
node-version: '16.15.1'
38+
- uses: actions/cache@v3
3939
id: cache
4040
with:
4141
path: ${{ env.CACHE_NODE_MODULES_PATH }}
4242
key: node_modules-${{ hashFiles('**/package-lock.json') }}
43-
- run: npm ci
43+
- run: yarn install --immutable --immutable-cache --check-cache
4444
if: steps.cache.outputs.cache-hit != 'true'
4545

4646
# build valor-software-site-base
4747
build:
4848
needs: install
4949
runs-on: ubuntu-latest
5050
steps:
51-
- uses: actions/checkout@v2
52-
- uses: actions/setup-node@v2
51+
- uses: actions/checkout@v3
52+
- uses: actions/setup-node@v3
5353
with:
54-
node-version: '14.17.0'
55-
- uses: actions/cache@v2
54+
node-version: '16.15.1'
55+
- uses: actions/cache@v3
5656
with:
5757
path: ${{ env.CACHE_NODE_MODULES_PATH }}
5858
key: node_modules-${{ hashFiles('**/package-lock.json') }}
59-
- uses: actions/cache@v2
59+
- uses: actions/cache@v3
6060
with:
6161
path: ${{ env.CACHE_DIST_PATH }}
6262
key: dist-${{ github.run_id }}
@@ -69,8 +69,8 @@ jobs:
6969
runs-on: ubuntu-latest
7070
needs: install
7171
steps:
72-
- uses: actions/checkout@v2
73-
- uses: actions/cache@v2
72+
- uses: actions/checkout@v3
73+
- uses: actions/cache@v3
7474
with:
7575
path: ${{ env.CACHE_NODE_MODULES_PATH }}
7676
key: node_modules-${{ hashFiles('**/package-lock.json') }}
@@ -83,8 +83,8 @@ jobs:
8383
outputs:
8484
output_url: ${{ steps.firebase_hosting_preview.outputs.details_url }}
8585
steps:
86-
- uses: actions/checkout@v2
87-
- uses: actions/cache@v2
86+
- uses: actions/checkout@v3
87+
- uses: actions/cache@v3
8888
with:
8989
path: ${{ env.CACHE_DIST_PATH }}
9090
key: dist-${{ github.run_id }}

.github/workflows/on_push_to_master.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ jobs:
1313
build-and-deploy:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v2
17-
- uses: actions/setup-node@v2
16+
- uses: actions/checkout@v3
17+
- uses: actions/setup-node@v3
1818
with:
19-
node-version: '14.17.0'
20-
- uses: actions/cache@v2
19+
node-version: '16.15.1'
20+
- uses: actions/cache@v3
2121
id: cache
2222
with:
2323
path: ${{ env.CACHE_NODE_MODULES_PATH }}
2424
key: node_modules-${{ hashFiles('**/package-lock.json') }}
25-
- run: npm ci
25+
- run: yarn install --immutable --immutable-cache --check-cache
2626
if: steps.cache.outputs.cache-hit != 'true'
2727
- run: |
2828
npx ng build --runner cloud --prod --skip-nx-cache

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
!.vscode/extensions.json
2727

2828
# misc
29+
/.angular/cache
2930
/.sass-cache
3031
/connect.lock
3132
/coverage

.scully/settings.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ staticPort: 1668
44
reloadPort: 2667
55
hostName: localhost
66
projectName: valor-software-site
7-
homeFolder: /home/svetlana/projects/valor-software.github.io
7+
homeFolder: /Users/zackarychapple/code/valor-software.github.io
88
distFolder: dist/apps/valor-software-site
9-
outDir: /home/svetlana/projects/valor-software.github.io/dist/valor-software-site
9+
outDir: /Users/zackarychapple/code/valor-software.github.io/dist/valor-software-site
1010
handle404: ''
1111
allowErrorCollect: false

0 commit comments

Comments
 (0)