Skip to content

Commit e718f13

Browse files
plarocque4plarocque4
authored
Merge pull request #128 from mcode/vite-config-updates
vite updates
2 parents 3715d7b + 4c3614b commit e718f13

File tree

11 files changed

+332
-341
lines changed

11 files changed

+332
-341
lines changed

‎.github/pull_request_template.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ Please include a summary of the changes and the related issue/task. Please also
77
Please include the Jira Ticket Number and Link for this issue/task.
88

99
## Checklist before requesting a review
10+
1011
- [ ] I have performed a self-review of my code
1112
- [ ] Ensure the target / base branch for any feature PR is set to `dev` not main (the only exception to this is releases from `dev` and hotfix branches)
1213

1314
## Checklist for conducting a review
14-
- [ ] Review the code changes and make sure they all make sense and are necessary.
15-
- [ ] Pull the PR branch locally and test by running through workflow and making sure everything works as it is supposed to.
1615

17-
## Workflow
16+
- [ ] Review the code changes and make sure they all make sense and are necessary.
17+
- [ ] Pull the PR branch locally and test by running through workflow and making sure everything works as it is supposed to.
1818

19-
Owner of the Pull Request will be responsible for merge after all requirements are met, including approval from at least one reviewer. Additional changes made after a review will dismiss any approvals and require re-review of the additional updates. Auto merging can be enabled below if additional changes are likely not to be needed. The bot will auto assign reviewers to your Pull Request for you.
19+
## Workflow
2020

21+
Owner of the Pull Request will be responsible for merge after all requirements are met, including approval from at least one reviewer. Additional changes made after a review will dismiss any approvals and require re-review of the additional updates. Auto merging can be enabled below if additional changes are likely not to be needed. The bot will auto assign reviewers to your Pull Request for you.

‎.github/workflows/ci-workflow.yml‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,39 @@ on: [push, pull_request]
44

55
jobs:
66
lint_frontend:
7-
defaults:
7+
defaults:
88
run:
99
working-directory: frontend
10-
name: Check tsc, lint, and prettier on front end
10+
name: Check tsc, lint, and prettier on front end
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v1
14-
- uses: actions/setup-node@v1
15-
with:
16-
node-version: '21.x'
17-
- run: npm install
18-
- run: npm run lint
19-
- run: npm run prettier
20-
env:
21-
CI: true
22-
lint_backend:
23-
defaults:
13+
- uses: actions/checkout@v1
14+
- uses: actions/setup-node@v1
15+
with:
16+
node-version: "21.x"
17+
- run: npm install
18+
- run: npm run lint
19+
- run: npm run prettier
20+
env:
21+
CI: true
22+
lint_backend:
23+
defaults:
2424
run:
25-
working-directory: backend
26-
name: Check tsc, lint, and prettier on back end
25+
working-directory: backend
26+
name: Check tsc, lint, and prettier on back end
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@v1
30-
- uses: actions/setup-node@v1
31-
with:
32-
node-version: '21.x'
33-
- run: npm install
34-
- run: npm run lint
35-
- run: npm run prettier
36-
env:
37-
CI: true
29+
- uses: actions/checkout@v1
30+
- uses: actions/setup-node@v1
31+
with:
32+
node-version: "21.x"
33+
- run: npm install
34+
- run: npm run lint
35+
- run: npm run prettier
36+
env:
37+
CI: true
3838
test_frontend:
39-
defaults:
39+
defaults:
4040
run:
4141
working-directory: frontend
4242
name: Test on node ${{ matrix.node-version }} and ${{ matrix.os }} on backend
@@ -47,34 +47,34 @@ jobs:
4747
node-version: [21]
4848

4949
steps:
50-
- uses: actions/checkout@v1
51-
- name: Use Node.js ${{ matrix.node-version }}
52-
uses: actions/setup-node@v1
53-
with:
54-
node-version: ${{ matrix.node-version }}
55-
- run: npm install
56-
- run: npm test
57-
env:
58-
CI: true
50+
- uses: actions/checkout@v1
51+
- name: Use Node.js ${{ matrix.node-version }}
52+
uses: actions/setup-node@v1
53+
with:
54+
node-version: ${{ matrix.node-version }}
55+
- run: npm install
56+
- run: npm test
57+
env:
58+
CI: true
5959

6060
test_backend:
61-
defaults:
61+
defaults:
6262
run:
6363
working-directory: backend
64-
name: Test on node ${{ matrix.node-version }} and ${{ matrix.os }} on backend
64+
name: Test on node ${{ matrix.node-version }} and ${{ matrix.os }} on backend
6565
runs-on: ${{ matrix.os }}
6666
strategy:
6767
matrix:
6868
os: [ubuntu-latest, windows-latest, macos-latest]
6969
node-version: [21]
7070

7171
steps:
72-
- uses: actions/checkout@v1
73-
- name: Use Node.js ${{ matrix.node-version }}
74-
uses: actions/setup-node@v1
75-
with:
76-
node-version: ${{ matrix.node-version }}
77-
- run: npm install
78-
- run: npm test
79-
env:
80-
CI: true
72+
- uses: actions/checkout@v1
73+
- name: Use Node.js ${{ matrix.node-version }}
74+
uses: actions/setup-node@v1
75+
with:
76+
node-version: ${{ matrix.node-version }}
77+
- run: npm install
78+
- run: npm test
79+
env:
80+
CI: true

‎.github/workflows/docker-cd-dev.yml‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,39 @@ name: Docker Development Image CD
22

33
on:
44
push:
5-
branches: [ dev ]
5+
branches: [dev]
66
workflow_dispatch:
77

88
jobs:
9-
docker-cd:
9+
docker-cd:
1010
runs-on: ubuntu-latest
1111
steps:
12+
- name: Checkout Repository
13+
uses: actions/checkout@v3
14+
with:
15+
submodules: true
1216

13-
- name: Checkout Repository
14-
uses: actions/checkout@v3
15-
with:
16-
submodules: true
17+
- name: Setup Docker Buildx
18+
uses: docker/setup-buildx-action@v2
1719

18-
- name: Setup Docker Buildx
19-
uses: docker/setup-buildx-action@v2
20+
- name: Docker meta data
21+
id: docker-meta-data
22+
uses: docker/metadata-action@v4
23+
with:
24+
images: codexrems/pims
25+
flavor: latest=false
2026

21-
- name: Docker meta data
22-
id: docker-meta-data
23-
uses: docker/metadata-action@v4
24-
with:
25-
images: codexrems/pims
26-
flavor: latest=false
27+
- name: Log in to Docker Hub
28+
uses: docker/login-action@v1
29+
with:
30+
username: ${{ secrets.DOCKER_USERNAME }}
31+
password: ${{ secrets.DOCKER_TOKEN }}
2732

28-
- name: Log in to Docker Hub
29-
uses: docker/login-action@v1
30-
with:
31-
username: ${{ secrets.DOCKER_USERNAME }}
32-
password: ${{ secrets.DOCKER_TOKEN }}
33-
34-
- name: Build and push Server Docker image
35-
uses: docker/build-push-action@v5
36-
with:
37-
context: .
38-
platforms: linux/amd64,linux/arm64
39-
push: true
40-
tags: codexrems/pims:experimental
41-
labels: ${{ steps.docker-meta-data.outputs.labels }}
33+
- name: Build and push Server Docker image
34+
uses: docker/build-push-action@v5
35+
with:
36+
context: .
37+
platforms: linux/amd64,linux/arm64
38+
push: true
39+
tags: codexrems/pims:experimental
40+
labels: ${{ steps.docker-meta-data.outputs.labels }}

‎.github/workflows/docker-cd.yml‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,39 @@ name: Docker Image CD
22

33
on:
44
push:
5-
branches: [ main ]
5+
branches: [main]
66
workflow_dispatch:
77

88
jobs:
9-
docker-cd:
9+
docker-cd:
1010
runs-on: ubuntu-latest
1111
steps:
12+
- name: Checkout Repository
13+
uses: actions/checkout@v3
14+
with:
15+
submodules: true
1216

13-
- name: Checkout Repository
14-
uses: actions/checkout@v3
15-
with:
16-
submodules: true
17+
- name: Setup Docker Buildx
18+
uses: docker/setup-buildx-action@v2
1719

18-
- name: Setup Docker Buildx
19-
uses: docker/setup-buildx-action@v2
20+
- name: Docker meta data
21+
id: docker-meta-data
22+
uses: docker/metadata-action@v4
23+
with:
24+
images: codexrems/pims
25+
flavor: latest=false
2026

21-
- name: Docker meta data
22-
id: docker-meta-data
23-
uses: docker/metadata-action@v4
24-
with:
25-
images: codexrems/pims
26-
flavor: latest=false
27+
- name: Log in to Docker Hub
28+
uses: docker/login-action@v1
29+
with:
30+
username: ${{ secrets.DOCKER_USERNAME }}
31+
password: ${{ secrets.DOCKER_TOKEN }}
2732

28-
- name: Log in to Docker Hub
29-
uses: docker/login-action@v1
30-
with:
31-
username: ${{ secrets.DOCKER_USERNAME }}
32-
password: ${{ secrets.DOCKER_TOKEN }}
33-
34-
- name: Build and push Server Docker image
35-
uses: docker/build-push-action@v5
36-
with:
37-
context: .
38-
platforms: linux/amd64,linux/arm64
39-
push: true
40-
tags: codexrems/pims:latest
41-
labels: ${{ steps.docker-meta-data.outputs.labels }}
33+
- name: Build and push Server Docker image
34+
uses: docker/build-push-action@v5
35+
with:
36+
context: .
37+
platforms: linux/amd64,linux/arm64
38+
push: true
39+
tags: codexrems/pims:latest
40+
labels: ${{ steps.docker-meta-data.outputs.labels }}

‎.github/workflows/docker-ci.yml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,17 @@ name: Docker Image CI
22

33
on:
44
pull_request:
5-
branches: [ main, dev ]
5+
branches: [main, dev]
66
workflow_dispatch:
77

8-
98
jobs:
10-
docker-ci:
9+
docker-ci:
1110
runs-on: ubuntu-latest
1211
steps:
13-
14-
- name: Checkout Repository
15-
uses: actions/checkout@v3
16-
with:
12+
- name: Checkout Repository
13+
uses: actions/checkout@v3
14+
with:
1715
submodules: true
1816

19-
- name: Test Server Docker image Builds
20-
run: docker build .
17+
- name: Test Server Docker image Builds
18+
run: docker build .

‎.github/workflows/docker-tag-cd.yml‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,38 @@ on:
33
workflow_dispatch:
44
push:
55
tags:
6-
- '*'
6+
- "*"
77

88
jobs:
99
docker:
1010
runs-on: ubuntu-latest
1111
steps:
12+
- name: Checkout Repository
13+
uses: actions/checkout@v3
14+
with:
15+
submodules: true
1216

13-
- name: Checkout Repository
14-
uses: actions/checkout@v3
15-
with:
16-
submodules: true
17-
18-
- name: Setup Docker Buildx
19-
uses: docker/setup-buildx-action@v2
20-
21-
- name: Docker meta data
22-
id: docker-meta-data
23-
uses: docker/metadata-action@v4
24-
with:
25-
images: codexrems/pims
26-
flavor: latest=false
17+
- name: Setup Docker Buildx
18+
uses: docker/setup-buildx-action@v2
2719

28-
- name: Log in to Docker Hub
29-
uses: docker/login-action@v2
30-
with:
31-
username: ${{ secrets.DOCKER_USERNAME }}
32-
password: ${{ secrets.DOCKER_TOKEN }}
20+
- name: Docker meta data
21+
id: docker-meta-data
22+
uses: docker/metadata-action@v4
23+
with:
24+
images: codexrems/pims
25+
flavor: latest=false
3326

34-
- name: Build and push
35-
uses: docker/build-push-action@v5
36-
with:
37-
context: .
38-
push: true
39-
platforms: linux/amd64,linux/arm64
40-
tags: ${{ steps.docker-meta-data.outputs.tags }}
41-
labels: ${{ steps.docker-meta-data.outputs.labels }}
27+
- name: Log in to Docker Hub
28+
uses: docker/login-action@v2
29+
with:
30+
username: ${{ secrets.DOCKER_USERNAME }}
31+
password: ${{ secrets.DOCKER_TOKEN }}
32+
33+
- name: Build and push
34+
uses: docker/build-push-action@v5
35+
with:
36+
context: .
37+
push: true
38+
platforms: linux/amd64,linux/arm64
39+
tags: ${{ steps.docker-meta-data.outputs.tags }}
40+
labels: ${{ steps.docker-meta-data.outputs.labels }}

0 commit comments

Comments
 (0)