Update cookiecutter

.ci/scripts/release.sh

@@ -23,4 +23,4 @@ towncrier build --yes --version "${NEW_VERSION}"
 bump-my-version bump release --commit --message "Release {new_version}" --tag --tag-name "{new_version}" --tag-message "Release {new_version}" --allow-dirty
 bump-my-version bump patch --commit
 
-git push --atomic origin "${BRANCH}" "${NEW_VERSION}"
+git push origin "${BRANCH}" "${NEW_VERSION}"

.github/workflows/build.yml

@@ -4,18 +4,12 @@ name: "Build"
 on:
   workflow_call:
 
-defaults:
-  run:
-    working-directory: "pulp-cli-gem"
-
 jobs:
   build:
     runs-on: "ubuntu-latest"
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v6"
-        with:
-          path: "pulp-cli-gem"
       - name: "Set up Python"
         uses: "actions/setup-python@v6"
         with:
@@ -34,8 +28,8 @@ jobs:
         with:
           name: "pulp_cli_packages"
           path: |
-            pulp-cli-gem/.root
-            pulp-cli-gem/dist/
+            .root
+            dist/
           if-no-files-found: "error"
           retention-days: 5
 ...

.github/workflows/codeql.yml

@@ -2,12 +2,11 @@
 name: "CodeQL"
 
 on:
+  push:
+    branches:
+      - "main"
   workflow_call:
 
-defaults:
-  run:
-    working-directory: "pulp-cli-gem"
-
 jobs:
   analyze:
     name: "Analyze"
@@ -20,8 +19,6 @@ jobs:
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v6"
-        with:
-          path: "pulp-cli-gem"
       - name: "Initialize CodeQL"
         uses: "github/codeql-action/init@v4"
         with:

.github/workflows/collect_changes.yml

@@ -4,21 +4,13 @@ on:
   workflow_call:
   workflow_dispatch:
 
-defaults:
-  run:
-    working-directory: "pulp-cli-gem"
-
 jobs:
   collect-changes:
-    permissions:
-      contents: "write"
-      pull-requests: "write"
     runs-on: "ubuntu-latest"
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v6"
         with:
-          path: "pulp-cli-gem"
           fetch-depth: 0
       - name: "Set up Python"
         uses: "actions/setup-python@v6"
@@ -40,16 +32,16 @@ jobs:
         uses: "peter-evans/create-pull-request@v8"
         id: "create_pr"
         with:
+          token: "${{ secrets.RELEASE_TOKEN }}"
           title: "Update Changelog"
           body: ""
           branch: "update_changes"
           delete-branch: true
-          path: "pulp-cli-gem"
       - name: "Mark PR automerge"
         run: |
           gh pr merge --rebase --auto "${{ steps.create_pr.outputs.pull-request-number }}"
         if: "steps.create_pr.outputs.pull-request-number"
         env:
-          GH_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}"
         continue-on-error: true
 ...

.github/workflows/cookiecutter.yml

@@ -11,18 +11,15 @@ defaults:
 
 jobs:
   update-ci:
-    permissions:
-      contents: "write"
-      pull-requests: "write"
     runs-on: "ubuntu-latest"
     steps:
       - uses: "actions/checkout@v6"
         with:
           repository: "pulp/pulp-cli"
           path: "pulp-cli"
-      - name: "Checkout"
-        uses: "actions/checkout@v6"
+      - uses: "actions/checkout@v6"
         with:
+          token: "${{ secrets.RELEASE_TOKEN }}"
           path: "pulp-cli-gem"
       - name: "Set up Python"
         uses: "actions/setup-python@v6"
@@ -49,6 +46,7 @@ jobs:
         uses: "peter-evans/create-pull-request@v8"
         id: "create_pr"
         with:
+          token: "${{ secrets.RELEASE_TOKEN }}"
           title: "Update cookiecutter"
           body: ""
           branch: "update_cookiecutter"
@@ -59,12 +57,9 @@ jobs:
           gh pr merge --rebase --auto "${{ steps.create_pr.outputs.pull-request-number }}"
         if: "steps.create_pr.outputs.pull-request-number"
         env:
-          GH_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}"
         continue-on-error: true
   update-dependencies:
-    permissions:
-      contents: "write"
-      pull-requests: "write"
     runs-on: "ubuntu-latest"
     steps:
       - uses: "actions/checkout@v6"
@@ -73,6 +68,7 @@ jobs:
           path: "pulp-cli"
       - uses: "actions/checkout@v6"
         with:
+          token: "${{ secrets.RELEASE_TOKEN }}"
           path: "pulp-cli-gem"
       - name: "Set up Python"
         uses: "actions/setup-python@v6"
@@ -99,6 +95,7 @@ jobs:
         uses: "peter-evans/create-pull-request@v8"
         id: "create_pr"
         with:
+          token: "${{ secrets.RELEASE_TOKEN }}"
           title: "Update CLI and GLUE"
           body: ""
           branch: "update_cli"
@@ -109,6 +106,6 @@ jobs:
           gh pr merge --rebase --auto "${{ steps.create_pr.outputs.pull-request-number }}"
         if: "steps.create_pr.outputs.pull-request-number"
         env:
-          GH_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}"
         continue-on-error: true
 ...

.github/workflows/lint.yml

@@ -4,10 +4,6 @@ name: "Lint"
 on:
   workflow_call:
 
-defaults:
-  run:
-    working-directory: "pulp-cli-gem"
-
 jobs:
   lint:
     runs-on: "ubuntu-latest"
@@ -20,8 +16,6 @@ jobs:
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v6"
-        with:
-          path: "pulp-cli-gem"
       - name: "Set up Python"
         uses: "actions/setup-python@v6"
         with:

.github/workflows/nightly.yml

@@ -1,5 +1,5 @@
 ---
-name: "Nightly"
+name: "pulp-cli Nightly"
 
 on:
   schedule:
@@ -14,10 +14,6 @@ jobs:
       - "build"
     uses: "./.github/workflows/test.yml"
   codeql:
-    permissions:
-      actions: "read"
-      contents: "read"
-      security-events: "write"
     uses: "./.github/workflows/codeql.yml"
   collect_changes:
     uses: "./.github/workflows/collect_changes.yml"

.github/workflows/pr.yml

@@ -1,5 +1,5 @@
 ---
-name: "Pull Request"
+name: "pulp-cli CI"
 
 on:
   pull_request:
@@ -22,18 +22,13 @@ jobs:
   codeql:
     needs:
       - "lint"
-    permissions:
-      actions: "read"
-      contents: "read"
-      security-events: "write"
     uses: "./.github/workflows/codeql.yml"
   check-commits:
     runs-on: "ubuntu-latest"
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v6"
         with:
-          path: "pulp-cli-gem"
           fetch-depth: 0
       - name: "Set up Python"
         uses: "actions/setup-python@v6"
@@ -58,7 +53,6 @@ jobs:
             fi
           done
         shell: "bash"
-        working-directory: "pulp-cli-gem"
   ready-to-ship:
     # This is a dummy dependent task to have a single entry for the branch protection rules.
     runs-on: "ubuntu-latest"

.github/workflows/pr_checks.yml

@@ -1,5 +1,5 @@
 ---
-name: "PR static checks"
+name: "Pulp CLI PR static checks"
 on:
   pull_request_target:
     types: ["opened", "synchronize", "reopened"]
@@ -12,21 +12,16 @@ concurrency:
   group: "${{ github.event.pull_request.number }}-${{ github.workflow }}"
   cancel-in-progress: true
 
-defaults:
-  run:
-    working-directory: "pulp-cli-gem"
-
 jobs:
   apply_labels:
-    permissions:
-      pull-requests: "write"
     runs-on: "ubuntu-latest"
     name: "Label PR"
+    permissions:
+      pull-requests: "write"
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v6"
         with:
-          path: "pulp-cli-gem"
           fetch-depth: 0
       - name: "Set up Python"
         uses: "actions/setup-python@v6"

.github/workflows/publish.yml

@@ -1,5 +1,5 @@
 ---
-name: "Publish"
+name: "pulp-cli Publish"
 
 on:
   push:
@@ -9,14 +9,11 @@ on:
 jobs:
   build:
     uses: "./.github/workflows/build.yml"
+  environment: "pypi"
   publish-pypi:
     name: "Publish to PyPI"
     needs: "build"
     runs-on: "ubuntu-latest"
-    environment:
-      name: "pypi"
-    permissions:
-      id-token: "write"
     steps:
       - name: "Download wheels"
         uses: "actions/download-artifact@v8"

.github/workflows/release.yml

@@ -1,24 +1,17 @@
 ---
-name: "Tag Release"
+name: "pulp-cli Release"
 
 on:
   workflow_dispatch:
 
-defaults:
-  run:
-    working-directory: "pulp-cli-gem"
-
 jobs:
   release:
     name: "Release"
-    permissions:
-      contents: "write"
     runs-on: "ubuntu-latest"
     steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v6"
+      - uses: "actions/checkout@v6"
         with:
-          path: "pulp-cli-gem"
+          token: "${{ secrets.RELEASE_TOKEN }}"
       - name: "Set up Python"
         uses: "actions/setup-python@v6"
         with:

.github/workflows/release_branch.yml

@@ -3,22 +3,13 @@ name: "Create Release Branch"
 on:
   workflow_dispatch:
 
-defaults:
-  run:
-    working-directory: "pulp-cli-gem"
-
 jobs:
   create-release-branch:
-    permissions:
-      contents: "write"
-      issues: "write"
-      pull-requests: "write"
     runs-on: "ubuntu-latest"
     steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v6"
+      - uses: "actions/checkout@v6"
         with:
-          path: "pulp-cli-gem"
+          token: "${{ secrets.RELEASE_TOKEN }}"
       - name: "Set up Python"
         uses: "actions/setup-python@v6"
         with:
@@ -39,17 +30,17 @@ jobs:
         uses: "peter-evans/create-pull-request@v8"
         id: "create_pr"
         with:
+          token: "${{ secrets.RELEASE_TOKEN }}"
           title: "Bump dev-version"
           body: ""
           branch: "bump_version"
           delete-branch: true
-          path: "pulp-cli-gem"
       - name: "Mark PR automerge"
         run: |
           gh pr merge --rebase --auto "${{ steps.create_pr.outputs.pull-request-number }}"
         if: "steps.create_pr.outputs.pull-request-number"
         env:
-          GH_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          GH_TOKEN: "${{ secrets.RELEASE_TOKEN }}"
         continue-on-error: true
       - name: "Add Backport Label for new Branch"
         uses: "actions/github-script@v8"

.github/workflows/test.yml

@@ -4,10 +4,6 @@ name: "Test"
 on:
   workflow_call:
 
-defaults:
-  run:
-    working-directory: "pulp-cli-gem"
-
 env:
   COLORTERM: "yes"
   TERM: "xterm-256color"
@@ -32,8 +28,6 @@ jobs:
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v6"
-        with:
-          path: "pulp-cli-gem"
       - name: "Download wheels"
         uses: "actions/download-artifact@v8"
         with:
@@ -70,5 +64,5 @@ jobs:
             RESOLUTION=()
           fi
 
-          uv run "${RESOLUTION[@]}" --isolated --with ../dist/pulp_glue*.whl --with ../dist/pulp_cli*.whl --only-group test .ci/run_container.sh make _test
+          uv run "${RESOLUTION[@]}" --isolated --with dist/pulp_glue*.whl --with dist/pulp_cli*.whl --only-group test .ci/run_container.sh make _test
 ...