Merge branch 'main' into podman-issues

.github/workflows/release.yml

@@ -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

backend/data_tools/Pipfile

@@ -14,7 +14,7 @@ desert = "2022.9.22"
 sqlalchemy-continuum = "==1.4.2"
 marshmallow-sqlalchemy = "==1.1.0"
 marshmallow-enum = "==1.5.1"
-alembic = "==1.13.3"
+alembic = "==1.14.0"
 alembic-postgresql-enum = "==1.3.0"
 azure-storage-blob = "==12.23.1"
 azure-identity = "==1.19.0"

backend/ops_api/Pipfile

@@ -4,7 +4,7 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-alembic = "==1.13.3"
+alembic = "==1.14.0"
 alembic-postgresql-enum = "==1.3.0"
 authlib = "==1.3.2"
 azure-identity = "==1.19.0"

docs/git-branching-and-releasing.md

@@ -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).