Fix Branch Strategy

.github/labeler.yml

@@ -13,6 +13,3 @@ hotfix:
 
 refactor:
   - head-branch: ["^refactor/"]
-
-release:
-  - head-branch: ["^release/"]

.github/protection.json

@@ -1,19 +1,4 @@
 {
-    "develop": {
-        "allow_deletions": false,
-        "allow_force_pushes": false,
-        "enforce_admins": false,
-        "required_pull_request_reviews": {
-            "dismiss_stale_reviews": false,
-            "require_code_owner_reviews": false,
-            "required_approving_review_count": 1
-        },
-        "required_status_checks": {
-            "contexts": [],
-            "strict": true
-        },
-        "restrictions": null
-    },
     "main": {
         "allow_deletions": false,
         "allow_force_pushes": false,

.github/workflows/approve.yml

@@ -12,7 +12,7 @@ jobs:
   approve:
     runs-on: ubuntu-latest
 
-    if: endsWith(github.actor, '[bot]')
+    if: github.event.pull_request.user.type == 'Bot'
 
     steps:
       - name: Checkout

.github/workflows/assign.yml

@@ -13,7 +13,7 @@ jobs:
   assign:
     runs-on: ubuntu-latest
 
-    if: endsWith(github.actor, '[bot]') == false && github.event.pull_request.assignee == null
+    if: github.event.pull_request.user.type != 'Bot' && github.event.pull_request.assignee == null
 
     steps:
       - name: Add assignees

.github/workflows/release.yml

@@ -3,60 +3,104 @@ name: Release
 on:
   push:
     branches:
-      - develop
       - main
+  release:
+    types:
+      - released
+
+concurrency:
+  group: release-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'push' }}
 
 permissions:
   contents: write
+  packages: write
   pull-requests: read
 
-jobs:
-  develop:
-    if: github.ref_name == 'develop'
+env:
+  REGISTRY: ghcr.io
 
+jobs:
+  publish:
     runs-on: ubuntu-latest
 
-    environment: Develop
+    environment: ${{ github.event_name == 'release' && 'Production' || 'Develop' }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - image: app
+            dockerfile: Dockerfile
+            description: App for Python development with uv-based dependency management and environment configuration.
+          - image: devcontainer
+            dockerfile: .devcontainer/Dockerfile
+            description: Dev Container for Python development with uv-based dependency management and environment configuration.
 
     steps:
       - name: Checkout
         uses: actions/checkout@v7
 
-      - name: Update Draft Release
-        uses: release-drafter/release-drafter@v7.10.0
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v4
+
+      - name: Log in to Container Registry
+        uses: docker/login-action@v4.6.0
         with:
-          config-name: release-drafter.yml
-          publish: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-  production:
-    if: github.ref_name == 'main'
+      - name: Extract Metadata
+        id: meta
+        uses: docker/metadata-action@v6
+        with:
+          images: ${{ env.REGISTRY }}/${{ github.repository }}/${{ matrix.image }}
+          tags: |
+            type=ref,event=branch
+            type=sha,format=long,enable=${{ github.event_name == 'push' }}
+            type=raw,value=${{ github.event.release.tag_name }},enable=${{ github.event_name == 'release' }}
+            type=raw,value=latest,enable=${{ github.event_name == 'release' }}
+          labels: |
+            maintainer=a5chin <a5chin.origin+contact@gmail.com>
+            org.opencontainers.image.authors=a5chin <a5chin.origin+contact@gmail.com>
+            org.opencontainers.image.description=${{ matrix.description }}
+            org.opencontainers.image.documentation=https://a5chin.github.io/python-uv/
+            org.opencontainers.image.licenses=MIT
+            org.opencontainers.image.source=https://github.com/${{ github.repository }}
+            org.opencontainers.image.title=python-uv
+            org.opencontainers.image.url=https://github.com/${{ github.repository }}
+            org.opencontainers.image.vendor=a5chin <a5chin.origin+contact@gmail.com>
+            org.opencontainers.image.version=${{ github.event.release.tag_name || github.ref_name }}
 
-    runs-on: ubuntu-latest
+      - name: Build and Push Image
+        uses: docker/build-push-action@v7
+        with:
+          context: .
+          file: ${{ matrix.dockerfile }}
+          push: true
+          provenance: false
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha,scope=${{ matrix.image }}
+          cache-to: type=gha,mode=max,scope=${{ matrix.image }}
 
-    environment: Production
+  draft:
+    needs: publish
+
+    if: github.event_name == 'push'
+
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
         uses: actions/checkout@v7
 
-      - name: Get PR Title for Version
-        id: pr
-        run: |
-          PR_TITLE=$(gh pr list --search "${{ github.sha }}" --state merged --json title --jq '.[0].title')
-          echo "TITLE=$PR_TITLE" >> "$GITHUB_OUTPUT"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Publish Release
+      - name: Update Draft Release
         uses: release-drafter/release-drafter@v7.10.0
         with:
           config-name: release-drafter.yml
-          name: ${{ env.VERSION }}
-          publish: true
-          tag: ${{ env.VERSION }}
-          version: ${{ env.VERSION }}
+          commitish: ${{ github.sha }}
+          publish: false
         env:
-          VERSION: ${{ steps.pr.outputs.TITLE }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/setting.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Enable auto-delete head branches
         run: |
           gh repo edit ${{ github.repository }} \
-            --default-branch develop \
+            --default-branch main \
             --delete-branch-on-merge
         env:
           GH_TOKEN: ${{ steps.generate-token.outputs.token }}
@@ -37,11 +37,14 @@ jobs:
       matrix:
         include:
           - environment: Develop
-            branch: develop
+            pattern: main
+            type: branch
           - environment: Production
-            branch: main
+            pattern: v*
+            type: tag
           - environment: github-pages
-            branch: gh-pages
+            pattern: gh-pages
+            type: branch
 
     steps:
       - name: Checkout
@@ -74,11 +77,12 @@ jobs:
           fi
 
           gh api -X POST "${{ env.ENDPOINT }}/${{ env.ENVIRONMENT_NAME }}/deployment-branch-policies" \
-            -f "name=${{ env.BRANCH_NAME }}" \
-            -f "type=branch"
+            -f "name=${{ env.POLICY_PATTERN }}" \
+            -f "type=${{ env.POLICY_TYPE }}"
         env:
           CONFIG_FILE: .github/environments.json
-          BRANCH_NAME: ${{ matrix.branch }}
+          POLICY_PATTERN: ${{ matrix.pattern }}
+          POLICY_TYPE: ${{ matrix.type }}
           ENDPOINT: repos/${{ github.repository }}/environments
           ENVIRONMENT_NAME: ${{ matrix.environment }}
           GH_TOKEN: ${{ steps.generate-token.outputs.token }}

.github/workflows/test.yml

@@ -16,7 +16,6 @@ on:
       - "uv.lock"
   push:
     branches:
-      - develop
       - main
     paths:
       - ".github/actions/setup-python-with-uv/action.yml"

.pre-commit-config.yaml

@@ -23,6 +23,7 @@ repos:
       - id: check-yaml
         name: Check YAML
         description: Check that YAML files are valid
+        args: [--unsafe]
 
       - id: detect-private-key
         name: Detect private key

.vscode/settings.json

@@ -23,6 +23,9 @@
             "path": "/bin/zsh"
         }
     },
+    "yaml.customTags": [
+        "tag:yaml.org,2002:python/name:pymdownx.superfences.fence_code_format"
+    ],
     "[dockercompose]": {
         "editor.defaultFormatter": "redhat.vscode-yaml",
         "editor.tabSize": 4