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.

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

Ops 2814/semantic release #3034

Merged
merged 7 commits into from
Nov 7, 2024
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
35 changes: 35 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Release
on:
push:
branches:
- main

permissions:
contents: read

jobs:
release:
name: Release
runs-on: ubuntu-latest
permissions:
contents: write # to be able to publish a GitHub release
issues: write # to be able to comment on released issues
pull-requests: write # to be able to comment on released pull requests
id-token: write # to enable use of OIDC for npm provenance
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: "lts/*"
- name: Install dependencies
working-directory: ./frontend
run: bun install
- name: Release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
working-directory: ./frontend
run: bun run semantic-release
43 changes: 43 additions & 0 deletions docs/git-branching-and-releasing.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# OPRE-OPS Branching Strategy

The OPRE Team currently uses the following branching strategy:
### main
* `main` is the default and primary branch. This will always be the most up-to-date released code base.
* `main` currently has branch protections in place, and requires a `pull request` with at least `2` approvals from someone on the `dev team`.

### Feature Branches
* Features should branch from `main` and utilize a naming format of `OPS-{Issue#}/{Feature_Name}`, example: `OPS-522/CAN_Details_Page`.

```mermaid
---
title: OPRE-OPS Git Branching
---
%%{init: {'gitGraph': {'showBranches': true, 'showCommitLabel':true,'mainBranchOrder': 4}} }%%
gitGraph
commit id: "initial commit"
commit
branch OPS-5xx/New_Feature_A
checkout OPS-5xx/New_Feature_A
commit
commit
checkout main
merge OPS-5xx/New_Feature_A
checkout main
commit
branch OPS-6xx/New_Feature_B
checkout OPS-6xx/New_Feature_B
commit
commit
commit
checkout main
merge OPS-6xx/New_Feature_B
```

# OPRE-OPS Release Strategy

The OPRE Team currently uses the following release strategy:

- When a PR is merged to `main` the GitHub Action `release.yml` will automatically create a new release in
GitHub with next version number.
- The `main` branch will be tagged with the new version number.
- The release will be published to the [GitHub Releases page](https://github.com/HHS/OPRE-OPS/releases).
60 changes: 0 additions & 60 deletions docs/git-branching.md

This file was deleted.

Binary file modified frontend/bun.lockb
Binary file not shown.
221 changes: 111 additions & 110 deletions frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,113 +1,114 @@
{
"name": "opre-ops",
"version": "1.0.1",
"license": "CC0-1.0",
"private": true,
"type": "module",
"dependencies": {
"@azure/storage-blob": "12.25.0",
"@eslint/compat": "1.2.2",
"@eslint/js": "9.14.0",
"@fortawesome/fontawesome-svg-core": "6.5.2",
"@fortawesome/free-regular-svg-icons": "6.5.2",
"@fortawesome/free-solid-svg-icons": "6.5.2",
"@fortawesome/react-fontawesome": "0.2.2",
"@nivo/bar": "0.87.0",
"@nivo/core": "0.87.0",
"@nivo/pie": "0.87.0",
"@reduxjs/toolkit": "2.3.0",
"@uswds/uswds": "3.9.0",
"@vitejs/plugin-react": "4.3.3",
"axios": "1.7.7",
"clsx": "2.1.1",
"crypto-random-string": "5.0.0",
"eslint": "9.14.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-cypress": "4.1.0",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-jest": "28.8.3",
"eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-prettier": "5.2.1",
"eslint-plugin-react": "7.37.2",
"eslint-plugin-react-hooks": "5.0.0",
"eslint-plugin-react-refresh": "0.4.14",
"eslint-plugin-testing-library": "6.4.0",
"jose": "5.9.6",
"js-cookie": "3.0.5",
"jsdom": "25.0.1",
"jwt-decode": "4.0.0",
"lodash": "4.17.21",
"react": "18.3.1",
"react-currency-format": "1.1.0",
"react-dom": "18.3.1",
"react-markdown": "9.0.1",
"react-modal": "3.16.1",
"react-redux": "9.1.2",
"react-router-dom": "6.27.0",
"react-select": "5.8.2",
"react-slider": "2.0.6",
"sass": "1.80.6",
"sass-loader": "16.0.3",
"styled-components": "6.1.13",
"vest": "5.4.3",
"vite": "5.4.10",
"vite-jsconfig-paths": "2.0.1",
"vite-plugin-babel-macros": "1.0.6",
"vite-plugin-eslint": "1.8.1",
"vite-plugin-svgr": "4.3.0"
},
"overrides": {
"rollup": "4.24.4"
},
"devDependencies": {
"@testing-library/jest-dom": "6.6.3",
"@testing-library/react": "16.0.1",
"@testing-library/user-event": "14.5.2",
"@types/testing-library__jest-dom": "6.0.0",
"@types/testing-library__react": "10.2.0",
"@vitest/coverage-istanbul": "2.1.4",
"@vitest/ui": "2.1.4",
"axe-core": "4.10.2",
"cypress": "13.15.2",
"cypress-axe": "1.5.0",
"cypress-localstorage-commands": "2.2.6",
"globals": "15.12.0",
"history": "5.3.0",
"msw": "2.6.2",
"prettier": "3.3.3",
"redux-mock-store": "1.5.5",
"@uswds/compile": "1.2.0",
"vitest": "2.1.4"
},
"scripts": {
"start": "vite",
"start:debug": "vite --inspect=0.0.0.0:9229",
"build": "vite build",
"test": "vitest",
"test:coverage": "vitest --coverage",
"test:ui": "vitest --ui --coverage.enabled=true",
"test:e2e:interactive": "cypress open --config-file ./cypress.config.js",
"test:e2e": "cypress run --config-file ./cypress.config.js --headless",
"test:e2e:debug": "DEBUG=cypress:* cypress run --config-file ./cypress.config.js --headless",
"lint": "eslint './src/**'",
"cypress:open": "cypress open",
"uswds:update": "bunx gulp compile"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"babelMacros": {
"fontawesome-svg-core": {
"license": "free"
}
"name": "opre-ops",
"version": "1.0.1",
"license": "CC0-1.0",
"private": true,
"type": "module",
"dependencies": {
"@azure/storage-blob": "12.25.0",
"@eslint/compat": "1.2.2",
"@eslint/js": "9.14.0",
"@fortawesome/fontawesome-svg-core": "6.5.2",
"@fortawesome/free-regular-svg-icons": "6.5.2",
"@fortawesome/free-solid-svg-icons": "6.5.2",
"@fortawesome/react-fontawesome": "0.2.2",
"@nivo/bar": "0.87.0",
"@nivo/core": "0.87.0",
"@nivo/pie": "0.87.0",
"@reduxjs/toolkit": "2.3.0",
"@uswds/uswds": "3.9.0",
"@vitejs/plugin-react": "4.3.3",
"axios": "1.7.7",
"clsx": "2.1.1",
"crypto-random-string": "5.0.0",
"eslint": "9.14.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-cypress": "4.1.0",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-jest": "28.8.3",
"eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-prettier": "5.2.1",
"eslint-plugin-react": "7.37.2",
"eslint-plugin-react-hooks": "5.0.0",
"eslint-plugin-react-refresh": "0.4.14",
"eslint-plugin-testing-library": "6.4.0",
"jose": "5.9.6",
"js-cookie": "3.0.5",
"jsdom": "25.0.1",
"jwt-decode": "4.0.0",
"lodash": "4.17.21",
"react": "18.3.1",
"react-currency-format": "1.1.0",
"react-dom": "18.3.1",
"react-markdown": "9.0.1",
"react-modal": "3.16.1",
"react-redux": "9.1.2",
"react-router-dom": "6.27.0",
"react-select": "5.8.2",
"react-slider": "2.0.6",
"sass": "1.80.6",
"sass-loader": "16.0.3",
"styled-components": "6.1.13",
"vest": "5.4.3",
"vite": "5.4.10",
"vite-jsconfig-paths": "2.0.1",
"vite-plugin-babel-macros": "1.0.6",
"vite-plugin-eslint": "1.8.1",
"vite-plugin-svgr": "4.3.0"
},
"overrides": {
"rollup": "4.24.4"
},
"devDependencies": {
"@testing-library/jest-dom": "6.6.3",
"@testing-library/react": "16.0.1",
"@testing-library/user-event": "14.5.2",
"@types/testing-library__jest-dom": "6.0.0",
"@types/testing-library__react": "10.2.0",
"@uswds/compile": "1.2.0",
"@vitest/coverage-istanbul": "2.1.4",
"@vitest/ui": "2.1.4",
"axe-core": "4.10.2",
"cypress": "13.15.2",
"cypress-axe": "1.5.0",
"cypress-localstorage-commands": "2.2.6",
"globals": "15.11.0",
"history": "5.3.0",
"msw": "2.6.0",
"prettier": "3.3.3",
"redux-mock-store": "1.5.5",
"semantic-release": "24.2.0",
"vitest": "2.1.4"
},
"scripts": {
"start": "vite",
"start:debug": "vite --inspect=0.0.0.0:9229",
"build": "vite build",
"test": "vitest",
"test:coverage": "vitest --coverage",
"test:ui": "vitest --ui --coverage.enabled=true",
"test:e2e:interactive": "cypress open --config-file ./cypress.config.js",
"test:e2e": "cypress run --config-file ./cypress.config.js --headless",
"test:e2e:debug": "DEBUG=cypress:* cypress run --config-file ./cypress.config.js --headless",
"lint": "eslint './src/**'",
"cypress:open": "cypress open",
"uswds:update": "bunx gulp compile"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"babelMacros": {
"fontawesome-svg-core": {
"license": "free"
}
}
}
Loading