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

Update CI files for branch 0.1 #147

Merged
merged 1 commit into from
Sep 18, 2023
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
2 changes: 1 addition & 1 deletion .github/template_gitref
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2021.08.26-246-g98b439a
2021.08.26-247-g1ee39ae
4 changes: 2 additions & 2 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ jobs:
fail-fast: false

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1

- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
with:
python-version: "3.8"

Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
ready-to-ship:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
with:
python-version: "3.8"

Expand All @@ -32,7 +32,7 @@ jobs:
name: Assert single commit
if: github.base_ref == 'main'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Checkout main
Expand All @@ -46,10 +46,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1
- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
with:
python-version: "3.8"
# lint_requirements contains tools needed for flake8, etc.
Expand Down Expand Up @@ -99,11 +99,11 @@ jobs:
deprecations-lowerbounds: ${{ steps.deprecations.outputs.deprecations-lowerbounds }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1

- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
with:
python-version: "3.8"

Expand Down
32 changes: 17 additions & 15 deletions .github/workflows/create-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
name: Create New Release Branch
on:
workflow_dispatch:
inputs:
name:
description: "Branch name (e.g. 3.14)"
required: true

env:
RELEASE_WORKFLOW: true
Expand All @@ -25,12 +21,12 @@ jobs:
fail-fast: false

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1
fetch-depth: 0
path: pulp_gem

- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
with:
python-version: "3.8"

Expand All @@ -46,26 +42,27 @@ jobs:
env:
SECRETS_CONTEXT: ${{ toJson(secrets) }}

- name: Verify that branch name matches current version string on main branch
- name: Determine new branch name
working-directory: pulp_gem
run: |
X_Y_VERSION=$(grep version setup.py | sed -rn 's/version="(.*)\.0((a[0-9]+)|(b[0-9]+))?\.dev",/\1/p' | awk '{$1=$1};1')
if [[ "$X_Y_VERSION" != "${{ inputs.name }}" ]]
# Just to be sure...
git checkout main
NEW_BRANCH="$(bump2version --dry-run --list release | sed -Ene 's/^new_version=([[:digit:]]+\.[[:digit:]]+)\..*$/\1/p')"
if [ -z "$NEW_BRANCH" ]
then
echo "Branch name doesn't match the current version string $X_Y_VERSION."
echo Could not determine the new branch name.
exit 1
fi
echo "NEW_BRANCH=${NEW_BRANCH}" >> "$GITHUB_ENV"

- name: Create ${{ inputs.name }} release branch
- name: Create release branch
working-directory: pulp_gem
run: |
git checkout -b ${{ inputs.name }}
git push origin ${{ inputs.name }}
git branch "${NEW_BRANCH}"

- name: Bump version on main branch
working-directory: pulp_gem
run: |
git checkout main
bump2version --no-commit minor

- name: Remove entries from CHANGES directory
Expand All @@ -88,3 +85,8 @@ jobs:
Bump minor version
[noissue]
delete-branch: true

- name: Push release branch
working-directory: pulp_gem
run: |
git push origin "${NEW_BRANCH}"
12 changes: 6 additions & 6 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ jobs:
- TEST: lowerbounds

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1

- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
with:
python-version: "3.8"

Expand Down Expand Up @@ -168,11 +168,11 @@ jobs:
changelog:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
with:
python-version: "3.11"

Expand Down Expand Up @@ -207,11 +207,11 @@ jobs:
TEST: publish

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1

- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
with:
python-version: "3.8"

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ jobs:
fail-fast: false

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
with:
python-version: "3.8"

Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
with:
name: pulp_gem.tar

- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
with:
python-version: "3.8"
- uses: ruby/setup-ruby@v1
Expand Down Expand Up @@ -201,7 +201,7 @@ jobs:
with:
name: pulp_gem.tar

- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
with:
python-version: "3.8"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
update_backport_labels:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
with:
python-version: "3.8"
- name: Configure Git with pulpbot name and email
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
path: plugin_template
fetch-depth: 0

- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
with:
python-version: "3.8"

Expand Down
Loading