Skip to content

Commit 07db0a0

Browse files
committed
Rename to BLEEDING_PULPCORE_REF to make intention more explicit
1 parent ce01f10 commit 07db0a0

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

templates/github/.github/workflows/build.yml.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ jobs:
4242
- name: "Install built packages"
4343
run: |
4444
{%- if plugin_name != "pulpcore" %}
45-
PULPCORE_REF="{{ '${{ inputs.pulpcore_ref }}' }}"
46-
if [ -n "$PULPCORE_REF" ]; then
45+
BLEEDING_PULPCORE_REF="{{ '${{ inputs.pulpcore_ref }}' }}"
46+
if [ -n "$BLEEDING_PULPCORE_REF" ]; then
4747
{{ resolve_pulpcore_ref() | indent(12) }}
4848
fi
4949
{%- endif %}

templates/github/.github/workflows/scripts/before_install.sh.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
{%- if plugin_name != "pulpcore" %}
1212
# Optional environment:
13-
# PULPCORE_REF - A pulpcore branch, commit SHA, or PR number to test against.
13+
# BLEEDING_PULPCORE_REF - A pulpcore branch, commit SHA, or PR number to test against.
1414
# When set, installs pulpcore from source and removes version pins
1515
# so the custom ref can be installed without constraint conflicts.
1616
#
@@ -54,7 +54,7 @@ if [[ "$TEST" = "lowerbounds" ]]; then
5454
fi
5555
{% if plugin_name != "pulpcore" %}
5656
# Relax constraints if a custom pulpcore is provided
57-
if [ -n "${PULPCORE_REF:-}" ]; then
57+
if [ -n "${BLEEDING_PULPCORE_REF:-}" ]; then
5858
{{ resolve_pulpcore_ref() | indent(2) }}
5959
echo "$PULPCORE_SOURCE" > ci_requirements.txt
6060
fi

templates/include/macros.j2

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ GITHUB_CONTEXT: "{{ '${{ github.event.pull_request.commits_url }}' }}"
77
{{ key }}: "{{ value }}"
88
{%- endfor %}
99
{%- if with_pulpcore_ref %}
10-
PULPCORE_REF: "{{ '${{ inputs.pulpcore_ref }}' }}"
10+
BLEEDING_PULPCORE_REF: "{{ '${{ inputs.pulpcore_ref }}' }}"
1111
{%- endif %}
1212
{%- if extra_env is not none %}
1313
{%- for key, value in extra_env.items() %}
@@ -123,10 +123,10 @@ pulpcore_ref:
123123

124124

125125
{%- macro resolve_pulpcore_ref(output_var="PULPCORE_SOURCE") -%}
126-
if [[ "$PULPCORE_REF" =~ ^[0-9]+$ ]]; then
127-
PULPCORE_REF="refs/pull/${PULPCORE_REF}/head"
126+
if [[ "$BLEEDING_PULPCORE_REF" =~ ^[0-9]+$ ]]; then
127+
BLEEDING_PULPCORE_REF="refs/pull/${BLEEDING_PULPCORE_REF}/head"
128128
fi
129-
{{ output_var }}="git+https://github.com/pulp/pulpcore.git@${PULPCORE_REF}"
129+
{{ output_var }}="git+https://github.com/pulp/pulpcore.git@${BLEEDING_PULPCORE_REF}"
130130
sed -i '/^pulpcore/d' .ci/assets/ci_constraints.txt
131131
if [ -f upperbounds_constraints.txt ]; then
132132
sed -i '/^pulpcore/d' upperbounds_constraints.txt

0 commit comments

Comments
 (0)