Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge staging branch with dependency updates #400

Merged
merged 16 commits into from
Oct 1, 2024
Merged

Merge staging branch with dependency updates #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0301b56
Bump dependencies with npm overrides
AntoineGautier Sep 26, 2024
316c9b3
Merge pull request #393 from lbl-srg/issue382_dependencies
mwetter Sep 27, 2024
7ad4c13
Bump version of GH actions
AntoineGautier Sep 27, 2024
0ee03ca
Merge pull request #394 from lbl-srg/bumpGhActions
mwetter Sep 27, 2024
4db486d
Bump version of @types/node
AntoineGautier Sep 27, 2024
2fd90b6
Merge pull request #395 from lbl-srg/bumpGhActions
mwetter Sep 27, 2024
6afa1cf
Bump version of GH actions
AntoineGautier Sep 27, 2024
6406f86
Merge pull request #396 from lbl-srg/bumpGhActions
mwetter Sep 27, 2024
f546362
Bump version of dependencies and GH actions
AntoineGautier Sep 27, 2024
e8e9671
Merge branch 'staging' of github.com:lbl-srg/ctrl-flow-dev into issue…
AntoineGautier Sep 27, 2024
e7dd43d
Update package-lock.json
AntoineGautier Sep 27, 2024
d3001f3
Merge pull request #397 from lbl-srg/issue382_dependencies2
mwetter Sep 28, 2024
6dddbee
Add dev dependency, bump app version
AntoineGautier Sep 30, 2024
88994d8
Merge pull request #398 from lbl-srg/issue382_dependencies2
mwetter Sep 30, 2024
2d69833
Use bracket notation to access property
AntoineGautier Sep 30, 2024
56ebe12
Merge pull request #399 from lbl-srg/issue382_dependencies2
mwetter Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/client-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/prod-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: main
env:
LBL_STAGE: production
LBL_STAGE: production
DEBIAN_FRONTEND: noninteractive
TEMPLATES_FILE_NAME: templates.json
jobs:
Expand All @@ -14,9 +14,9 @@ jobs:
run:
working-directory: server
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
Expand All @@ -31,7 +31,7 @@ jobs:
- name: Copy templates.json out of the container
run: docker cp $CONTAINER_ID:/server/scripts/templates.json $TEMPLATES_FILE_NAME
- name: Upload templates.json as an artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: template
path: ${{github.workspace}}/${{env.TEMPLATES_FILE_NAME}}
Expand All @@ -50,21 +50,21 @@ jobs:
node-version: [18.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
cache-dependency-path: client/package-lock.json
- name: Configure AWS CLI
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-east-2
- name: Update template.json
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: template
path: ${{github.workspace}}/client/src/data
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/server-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ jobs:
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Node ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
Expand Down
17 changes: 8 additions & 9 deletions .github/workflows/staging-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: ctrl-flow staging deployment

on:
push:
branches: staging
branches: staging
env:
LBL_STAGE: staging
DEBIAN_FRONTEND: noninteractive
Expand All @@ -14,9 +14,9 @@ jobs:
run:
working-directory: server
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
Expand All @@ -31,7 +31,7 @@ jobs:
- name: Copy templates.json out of the container
run: docker cp $CONTAINER_ID:/server/scripts/templates.json $TEMPLATES_FILE_NAME
- name: Upload templates.json as an artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: template
path: ${{github.workspace}}/${{env.TEMPLATES_FILE_NAME}}
Expand All @@ -50,21 +50,21 @@ jobs:
node-version: [18.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
cache-dependency-path: client/package-lock.json
- name: Configure AWS CLI
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-east-2
- name: Update template.json
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: template
path: ${{github.workspace}}/client/src/data
Expand Down Expand Up @@ -97,4 +97,3 @@ jobs:
AWS_REGION: us-east-2
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

Loading