Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@ Please include a summary of the changes and the related issue/task. Please also
Please include the Jira Ticket Number and Link for this issue/task.

## Checklist before requesting a review

- [ ] I have performed a self-review of my code
- [ ] 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)

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

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

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.
## Workflow

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.
90 changes: 45 additions & 45 deletions .github/workflows/ci-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,39 @@ on: [push, pull_request]

jobs:
lint_frontend:
defaults:
defaults:
run:
working-directory: frontend
name: Check tsc, lint, and prettier on front end
name: Check tsc, lint, and prettier on front end
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: '21.x'
- run: npm install
- run: npm run lint
- run: npm run prettier
env:
CI: true
lint_backend:
defaults:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: "21.x"
- run: npm install
- run: npm run lint
- run: npm run prettier
env:
CI: true
lint_backend:
defaults:
run:
working-directory: backend
name: Check tsc, lint, and prettier on back end
working-directory: backend
name: Check tsc, lint, and prettier on back end
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: '21.x'
- run: npm install
- run: npm run lint
- run: npm run prettier
env:
CI: true
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
with:
node-version: "21.x"
- run: npm install
- run: npm run lint
- run: npm run prettier
env:
CI: true
test_frontend:
defaults:
defaults:
run:
working-directory: frontend
name: Test on node ${{ matrix.node-version }} and ${{ matrix.os }} on backend
Expand All @@ -47,34 +47,34 @@ jobs:
node-version: [21]

steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm test
env:
CI: true
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm test
env:
CI: true

test_backend:
defaults:
defaults:
run:
working-directory: backend
name: Test on node ${{ matrix.node-version }} and ${{ matrix.os }} on backend
name: Test on node ${{ matrix.node-version }} and ${{ matrix.os }} on backend
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
node-version: [21]

steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm test
env:
CI: true
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- run: npm test
env:
CI: true
55 changes: 27 additions & 28 deletions .github/workflows/docker-cd-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,39 @@ name: Docker Development Image CD

on:
push:
branches: [ dev ]
branches: [dev]
workflow_dispatch:

jobs:
docker-cd:
docker-cd:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3
with:
submodules: true

- name: Checkout Repository
uses: actions/checkout@v3
with:
submodules: true
- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Docker meta data
id: docker-meta-data
uses: docker/metadata-action@v4
with:
images: codexrems/pims
flavor: latest=false

- name: Docker meta data
id: docker-meta-data
uses: docker/metadata-action@v4
with:
images: codexrems/pims
flavor: latest=false
- name: Log in to Docker Hub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }}

- name: Log in to Docker Hub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }}

- name: Build and push Server Docker image
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/amd64,linux/arm64
push: true
tags: codexrems/pims:experimental
labels: ${{ steps.docker-meta-data.outputs.labels }}
- name: Build and push Server Docker image
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/amd64,linux/arm64
push: true
tags: codexrems/pims:experimental
labels: ${{ steps.docker-meta-data.outputs.labels }}
55 changes: 27 additions & 28 deletions .github/workflows/docker-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,39 @@ name: Docker Image CD

on:
push:
branches: [ main ]
branches: [main]
workflow_dispatch:

jobs:
docker-cd:
docker-cd:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3
with:
submodules: true

- name: Checkout Repository
uses: actions/checkout@v3
with:
submodules: true
- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Docker meta data
id: docker-meta-data
uses: docker/metadata-action@v4
with:
images: codexrems/pims
flavor: latest=false

- name: Docker meta data
id: docker-meta-data
uses: docker/metadata-action@v4
with:
images: codexrems/pims
flavor: latest=false
- name: Log in to Docker Hub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }}

- name: Log in to Docker Hub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }}

- name: Build and push Server Docker image
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/amd64,linux/arm64
push: true
tags: codexrems/pims:latest
labels: ${{ steps.docker-meta-data.outputs.labels }}
- name: Build and push Server Docker image
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/amd64,linux/arm64
push: true
tags: codexrems/pims:latest
labels: ${{ steps.docker-meta-data.outputs.labels }}
16 changes: 7 additions & 9 deletions .github/workflows/docker-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,17 @@ name: Docker Image CI

on:
pull_request:
branches: [ main, dev ]
branches: [main, dev]
workflow_dispatch:


jobs:
docker-ci:
docker-ci:
runs-on: ubuntu-latest
steps:

- name: Checkout Repository
uses: actions/checkout@v3
with:
- name: Checkout Repository
uses: actions/checkout@v3
with:
submodules: true

- name: Test Server Docker image Builds
run: docker build .
- name: Test Server Docker image Builds
run: docker build .
55 changes: 27 additions & 28 deletions .github/workflows/docker-tag-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,38 @@ on:
workflow_dispatch:
push:
tags:
- '*'
- "*"

jobs:
docker:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3
with:
submodules: true

- name: Checkout Repository
uses: actions/checkout@v3
with:
submodules: true

- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Docker meta data
id: docker-meta-data
uses: docker/metadata-action@v4
with:
images: codexrems/pims
flavor: latest=false
- name: Setup Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Log in to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }}
- name: Docker meta data
id: docker-meta-data
uses: docker/metadata-action@v4
with:
images: codexrems/pims
flavor: latest=false

- name: Build and push
uses: docker/build-push-action@v5
with:
context: .
push: true
platforms: linux/amd64,linux/arm64
tags: ${{ steps.docker-meta-data.outputs.tags }}
labels: ${{ steps.docker-meta-data.outputs.labels }}
- name: Log in to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v5
with:
context: .
push: true
platforms: linux/amd64,linux/arm64
tags: ${{ steps.docker-meta-data.outputs.tags }}
labels: ${{ steps.docker-meta-data.outputs.labels }}
Loading