Update CI files for branch 2.4

.ci/scripts/check_release.py

@@ -37,7 +37,10 @@ def template_config():
 def current_version(repo, commitish):
     try:
         pyproject_toml = tomllib.loads(repo.git.show(f"{commitish}:pyproject.toml"))
-        current_version = pyproject_toml["project"]["version"]
+        try:
+            current_version = pyproject_toml["project"]["version"]
+        except Exception:
+            current_version = pyproject_toml["tool"]["bumpversion"]["current_version"]
     except Exception:
         current_version = repo.git.grep(
             "current_version", commitish, "--", ".bumpversion.cfg"

.ci/scripts/check_requirements.py

@@ -62,7 +62,10 @@ def main():
                 else:
                     if check_prereleases and req.specifier.prereleases:
                         # Do not even think about begging for more exceptions!
-                        if req.name != "pulp-ostree-client":
+                        if (
+                            not req.name.startswith("opentelemetry")
+                            and req.name != "pulp-ostree-client"
+                        ):
                             errors.append(f"{filename}:{nr}: Prerelease versions found in {line}.")
                     ops = [spec.operator for spec in req.specifier]
                     if "~=" in ops:

.github/template_gitref

@@ -1 +1 @@
-2021.08.26-399-g78ad960
+2021.08.26-405-g3845bbc

.github/workflows/ci.yml

@@ -56,6 +56,9 @@ jobs:
   test:
     needs: "build"
     uses: "./.github/workflows/test.yml"
+    with:
+      matrix_env: |
+        [{"TEST": "pulp"}, {"TEST": "azure"}, {"TEST": "s3"}, {"TEST": "lowerbounds"}]
 
   deprecations:
     runs-on: "ubuntu-latest"

.github/workflows/nightly.yml

@@ -29,6 +29,9 @@ jobs:
   test:
     needs: "build"
     uses: "./.github/workflows/test.yml"
+    with:
+      matrix_env: |
+        [{"TEST": "pulp"}, {"TEST": "azure"}, {"TEST": "s3"}, {"TEST": "lowerbounds"}]
 
   changelog:
     runs-on: ubuntu-latest
@@ -65,3 +68,4 @@ jobs:
           branch: "changelog/update"
           delete-branch: true
           path: "pulp_ostree"
+...

.github/workflows/scripts/publish_plugin_pypi.sh

@@ -28,6 +28,6 @@ then
 fi
 
 twine upload -u __token__ -p "$PYPI_API_TOKEN" \
-"dist/pulp_ostree-$VERSION-py3-none-any.whl" \
-"dist/pulp-ostree-$VERSION.tar.gz" \
+dist/pulp?ostree-"$VERSION"-py3-none-any.whl \
+dist/pulp?ostree-"$VERSION".tar.gz \
 ;

.github/workflows/test.yml

@@ -9,6 +9,10 @@
 name: "Test"
 on:
   workflow_call:
+    inputs:
+      matrix_env:
+        required: true
+        type: string
 
 defaults:
   run:
@@ -20,11 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        env:
-          - TEST: pulp
-          - TEST: azure
-          - TEST: s3
-          - TEST: lowerbounds
+        env: ${{ fromJSON(inputs.matrix_env) }}
 
     steps:
       - uses: "actions/checkout@v4"
@@ -88,10 +88,6 @@ jobs:
           ANSIBLE_FORCE_COLOR: "1"
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           GITHUB_CONTEXT: "${{ github.event.pull_request.commits_url }}"
-      - uses: ruby/setup-ruby@v1
-        if: ${{ env.TEST == 'pulp' }}
-        with:
-          ruby-version: "2.6"
 
       - name: "Install"
         run: |