Skip to content

Commit 85b3398

Browse files
authored
Merge pull request #770 from pulp/update-ci/main
Update CI files for branch main
2 parents cedfd04 + dade83e commit 85b3398

File tree

5 files changed

+14
-11
lines changed

5 files changed

+14
-11
lines changed

.github/template_gitref

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2021.08.26-403-g76d04d7
1+
2021.08.26-405-g3845bbc

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ jobs:
5656
test:
5757
needs: "build"
5858
uses: "./.github/workflows/test.yml"
59+
with:
60+
matrix_env: |
61+
[{"TEST": "pulp"}, {"TEST": "azure"}, {"TEST": "s3"}, {"TEST": "lowerbounds"}]
5962
6063
deprecations:
6164
runs-on: "ubuntu-latest"

.github/workflows/nightly.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ jobs:
2929
test:
3030
needs: "build"
3131
uses: "./.github/workflows/test.yml"
32+
with:
33+
matrix_env: |
34+
[{"TEST": "pulp"}, {"TEST": "azure"}, {"TEST": "s3"}, {"TEST": "lowerbounds"}]
3235
3336
changelog:
3437
runs-on: ubuntu-latest
@@ -65,3 +68,4 @@ jobs:
6568
branch: "changelog/update"
6669
delete-branch: true
6770
path: "pulp_python"
71+
...

.github/workflows/test.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
name: "Test"
1010
on:
1111
workflow_call:
12+
inputs:
13+
matrix_env:
14+
required: true
15+
type: string
1216

1317
defaults:
1418
run:
@@ -20,11 +24,7 @@ jobs:
2024
strategy:
2125
fail-fast: false
2226
matrix:
23-
env:
24-
- TEST: pulp
25-
- TEST: azure
26-
- TEST: s3
27-
- TEST: lowerbounds
27+
env: ${{ fromJSON(inputs.matrix_env) }}
2828

2929
steps:
3030
- uses: "actions/checkout@v4"
@@ -88,10 +88,6 @@ jobs:
8888
ANSIBLE_FORCE_COLOR: "1"
8989
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
9090
GITHUB_CONTEXT: "${{ github.event.pull_request.commits_url }}"
91-
- uses: ruby/setup-ruby@v1
92-
if: ${{ env.TEST == 'pulp' }}
93-
with:
94-
ruby-version: "2.6"
9591

9692
- name: "Install"
9793
run: |

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,4 @@ replace = "version = \"{new_version}\""
107107

108108
filename = "./pyproject.toml"
109109
search = "version = \"{current_version}\""
110-
replace = "version = \"{new_version}\""
110+
replace = "version = \"{new_version}\""

0 commit comments

Comments
 (0)