Skip to content

Commit

Permalink
- deleted obsolete Makefile (#754)
Browse files Browse the repository at this point in the history
- app version = 5.13.0
- added scripts to package.json
- updated CD script
- updated CI script

Co-authored-by: Severin Beauvais <[email protected]>
  • Loading branch information
severinbeauvais and Severin Beauvais authored Oct 25, 2024
1 parent 3ffa8dd commit 967cd80
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 165 deletions.
23 changes: 10 additions & 13 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,29 @@
name: BUSINESS CREATE UI CD
name: Business Create UI CD

on:
push:
branches:
- main
- feature*
- hotfix*
workflow_dispatch:
inputs:
environment:
description: "Environment"
target:
description: "Deploy To"
required: true
type: choice
options:
- dev
- test
- sandbox
- prod
tagname:
description: "Specify a previous version (git tag) to deploy"
required: false
default: ""

jobs:
business-create-ui-cd:
uses: bcgov/bcregistry-sre/.github/workflows/ui-cd-node20.yaml@main
uses: bcgov/bcregistry-sre/.github/workflows/frontend-cd.yaml@main
with:
environment: ${{ inputs.environment }}
tagname: ${{ inputs.tagname }}
target: ${{ inputs.target }}
app_name: "business-create-ui"
secrets:
APP_NAME: "business-create"
OP_CONNECT_URL: ${{ secrets.OP_CONNECT_URL }}
OP_CONNECT_TOKEN: ${{ secrets.OP_CONNECT_TOKEN }}
WORKLOAD_IDENTIFY_POOLS_PROVIDER: ${{ secrets.WORKLOAD_IDENTIFY_POOLS_PROVIDER }}
GCP_SERVICE_ACCOUNT: ${{ secrets.GCP_SERVICE_ACCOUNT }}
80 changes: 10 additions & 70 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,79 +1,19 @@
name: BUSINESS CREATE UI CI
name: Business Create UI CI

on:
pull_request:
types: [assigned, synchronize]
branches:
- main
- feature*
workflow_dispatch:

defaults:
run:
shell: bash

jobs:
setup-job:
runs-on: ubuntu-20.04

if: github.repository == 'bcgov/business-create-ui'

steps:
- uses: actions/checkout@v3
- run: "true"

linting:
needs: setup-job
runs-on: ubuntu-20.04

strategy:
matrix:
node-version: [20.5.1]

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Install dependencies
run: |
make setup
- name: Linting
run: |
make lint
testing-coverage:
needs: setup-job
runs-on: ubuntu-20.04

strategy:
matrix:
node-version: [20.5.1]

steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: Install dependencies
run: |
make setup
- name: Test with Vitest
id: test
run: |
make test
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
with:
name: codecov-business-create
fail_ci_if_error: false
token: ${{ secrets.CODECOV_TOKEN }}

build-check:
needs: setup-job
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3
- name: build to check strictness
id: build
run: |
make build-nc
business-create-ui-ci:
uses: bcgov/bcregistry-sre/.github/workflows/frontend-ci.yaml@main
with:
node_version: "20.5.1"
app_name: "business-create-ui"
77 changes: 0 additions & 77 deletions Makefile

This file was deleted.

4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
{
"name": "business-create-ui",
"version": "5.12.11",
"version": "5.13.0",
"private": true,
"appName": "Create UI",
"sbcName": "SBC Common Components",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview",
"lint": "eslint . --ext .js,.ts,.vue",
"build-check": "vite build",
"preview": "vite preview --port 8080",
"lint": "eslint . --ext js,ts,vue --no-fix",
"lint:fix": "eslint . --ext js,ts,vue --fix src",
"test": "vitest run",
"test:unit": "vitest run",
"test:watch": "vitest watch",
"test:coverage": "vitest run --coverage"
},
"dependencies": {
Expand Down

0 comments on commit 967cd80

Please sign in to comment.