Skip to content

Commit 12b9ff5

Browse files
committed
Merge remote-tracking branch 'upstream/development' into pr/1727
2 parents 1d98ac3 + 59e346b commit 12b9ff5

File tree

178 files changed

+8830
-14655
lines changed

Some content is hidden

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

178 files changed

+8830
-14655
lines changed

.github/workflows/New-issue-create-card.yml

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

.github/workflows/all-PRs.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@ jobs:
99
test-backend-unit:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v4
1313
- name: Make envfile
14-
uses: SpicyPizza/create-envfile@v1
14+
uses: SpicyPizza/create-envfile@v2
1515
with:
1616
envkey_BACKEND_PORT: ${{ secrets.BACKEND_PORT }}
1717
envkey_REACT_APP_PROXY: ${{ secrets.REACT_APP_PROXY }}
1818
file_name: backend/.env
1919
- name: Build the backend container
20-
run: docker-compose build backend
20+
run: docker compose build backend
2121
- name: Run backend unit test suite
22-
run: docker-compose run --rm backend yarn run test --testPathIgnorePatterns=routers
22+
run: docker compose run --rm backend yarn run test --testPathIgnorePatterns=routers
2323

2424
test-backend-integration:
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@v2
27+
- uses: actions/checkout@v4
2828
- name: Make envfile
29-
uses: SpicyPizza/create-envfile@v1
29+
uses: SpicyPizza/create-envfile@v2
3030
with:
3131
envkey_CUSTOM_REQUEST_HEADER: ${{ secrets.CUSTOM_REQUEST_HEADER }}
3232
envkey_SLACK_OAUTH_TOKEN: ${{ secrets.SLACK_OAUTH_TOKEN }}
@@ -47,24 +47,24 @@ jobs:
4747
envkey_MAILHOG_PASSWORD: ${{ secrets.MAILHOG_PASSWORD }}
4848
file_name: backend/.env
4949
- name: Build the backend container
50-
run: docker-compose build backend
50+
run: docker compose build backend
5151
- name: Run backend integration test suite
52-
run: docker-compose run --rm backend yarn run test backend/routers/
52+
run: docker compose run --rm backend yarn run test backend/routers/
5353

5454
test-client-unit:
5555
runs-on: ubuntu-latest
5656
steps:
57-
- uses: actions/checkout@v2
57+
- uses: actions/checkout@v4
5858
- name: Build the client container
59-
run: docker-compose build client
59+
run: docker compose build client
6060
- name: Run client unit test suite
61-
run: docker-compose run --rm client yarn run test
61+
run: docker compose run --rm client yarn run test
6262

6363
# test-mvp-unit:
6464
# runs-on: ubuntu-latest
6565
# steps:
66-
# - uses: actions/checkout@v2
66+
# - uses: actions/checkout@v4
6767
# - name: Build the client mvp container
68-
# run: docker-compose build client-mvp-04
68+
# run: docker compose build client-mvp-04
6969
# - name: Run frontend unit test suite
70-
# run: docker-compose run --rm client-mvp-04 yarn run test
70+
# run: docker compose run --rm client-mvp-04 yarn run test

.github/workflows/all-merges.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
if: github.event.pull_request.merged == true
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414
- name: Set up QEMU
1515
uses: docker/setup-qemu-action@v1
1616
- name: Set up Docker Buildx

.github/workflows/aws-backend-deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Debug Action
2626
uses: hmarr/[email protected]
2727
- name: Checkout
28-
uses: actions/checkout@v2
28+
uses: actions/checkout@v4
2929
with:
3030
ref: ${{ github.event.inputs.ref }}
3131
- name: Set AWS Env & Image Tag per workflow
@@ -45,7 +45,7 @@ jobs:
4545
needs: [setup_env]
4646
steps:
4747
- name: Checkout
48-
uses: actions/checkout@v2
48+
uses: actions/checkout@v4
4949
with:
5050
ref: ${{ github.event.inputs.ref }}
5151
- name: Configure AWS credentials

.github/workflows/aws-frontend-deploy.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ jobs:
4848
uses: actions/checkout@v3
4949
with:
5050
ref: ${{ github.event.inputs.ref }}
51+
- name: Checkout
52+
uses: actions/setup-node@v3
53+
with:
54+
node-version: 18
55+
cache: 'npm'
5156
- name: Configure AWS credentials
5257
uses: aws-actions/configure-aws-credentials@v2
5358
with:

.github/workflows/pr-instructions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
Add-Pull-Request-Instructions:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2
12+
- uses: actions/checkout@v4
1313

1414
# Create the message to post
1515
- name: Create Instruction
@@ -28,7 +28,7 @@ jobs:
2828
echo ${{ steps.instruction.outputs.result }} > addingPrInstructions/artifact/artifact.txt
2929
3030
- name: Upload Artifacts
31-
uses: actions/upload-artifact@v2
31+
uses: actions/upload-artifact@v3
3232
with:
3333
name: adding-pr-instructions-artifact
3434
path: addingPrInstructions/artifact/

.github/workflows/wr-pr-instructions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
const artifactJSON = JSON.parse(artifact);
4545
return artifactJSON
4646
47-
- uses: actions/checkout@v2
47+
- uses: actions/checkout@v4
4848
# Create the message to post
4949
- name: Post Comment
5050
uses: actions/github-script@v4

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16
1+
18

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
VRMS is governed by the [Hack for LA Code of Conduct](https://www.hackforla.org/code-of-conduct/) which applies to any interaction on our VRMS slack channel (inside the HackforLA Slack workspace), direct slack messages, github org or repository, or any other communication medium.

0 commit comments

Comments
 (0)