Skip to content

Commit

Permalink
Update actions with deprecated versions
Browse files Browse the repository at this point in the history
[noissue]
  • Loading branch information
mdellweg committed May 7, 2024
1 parent 63d3740 commit 0b7d0c1
Show file tree
Hide file tree
Showing 10 changed files with 41 additions and 39 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
path: "plugin_template"
# We need the full history for bootstrapping
fetch-depth: 0
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: "3.11"
- name: "Bootstrap catdog plugin"
Expand All @@ -44,7 +44,7 @@ jobs:
python3 setup.py sdist bdist_wheel --python-tag py3
twine check dist/*
- name: "Upload Package whl"
uses: "actions/upload-artifact@v3"
uses: "actions/upload-artifact@v4"
with:
name: "plugin_package"
path: "pulp_catdog/dist/"
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
with:
path: "plugin_template"
fetch-depth: 0
- uses: "actions/setup-python@v4"
- uses: "actions/setup-python@v5"
with:
python-version: "3.11"
- name: "Bootstrap catdog plugin"
Expand Down Expand Up @@ -70,10 +70,11 @@ jobs:
mkdir -p "pulp_catdog"
working-directory: "."
- name: "Download Deprecations"
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: "deprecations"
pattern: "deprecations-*"
path: "pulp_catdog"
merge-multiple: true
- name: "Print deprecations"
run: |
cat deprecations-*.txt | sort -u
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
path: "plugin_template"
# We need the full history for bootstrapping
fetch-depth: 0
- uses: "actions/setup-python@v4"
- uses: "actions/setup-python@v5"
with:
python-version: "3.11"
- name: "Lint plugin_template"
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
# We need the full history for bootstrapping
fetch-depth: 0

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

Expand All @@ -52,7 +52,7 @@ jobs:
repository: "pulp/pulp-openapi-generator"
path: "pulp-openapi-generator"

- uses: "actions/download-artifact@v3"
- uses: "actions/download-artifact@v4"
with:
name: "plugin_package"
path: "pulp_catdog/dist/"
Expand Down Expand Up @@ -128,15 +128,15 @@ jobs:
docker logs pulp 2>&1 | grep -i pulpcore.deprecation | tee deprecations-${{ matrix.env.TEST }}.txt
- name: "Upload Deprecations"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "deprecations"
name: "deprecations-${{ matrix.env.TEST }}"
path: "pulp_catdog/deprecations-${{ matrix.env.TEST }}.txt"
if-no-files-found: "error"
retention-days: 5
- name: Upload python client packages
if: ${{ env.TEST == 'pulp' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "python-client.tar"
path: "pulp_catdog/catdog-python-client.tar"
Expand All @@ -145,23 +145,23 @@ jobs:

- name: Upload python client docs
if: ${{ env.TEST == 'pulp' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "python-client-docs.tar"
path: "pulp_catdog/catdog-python-client-docs.tar"
if-no-files-found: "error"
retention-days: 5
- name: Upload Ruby client
if: ${{ env.TEST == 'pulp' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "ruby-client.tar"
path: "pulp_catdog/catdog-ruby-client.tar"
if-no-files-found: "error"
retention-days: 5
- name: Upload built docs
if: ${{ env.TEST == 'docs' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "docs.tar"
path: "pulp_catdog/docs/docs.tar"
Expand Down
2 changes: 1 addition & 1 deletion templates/github/.github/workflows/build.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
python3 setup.py sdist bdist_wheel --python-tag py3
twine check dist/*
- name: "Upload Package whl"
uses: "actions/upload-artifact@v3"
uses: "actions/upload-artifact@v4"
with:
name: "plugin_package"
path: "{{ plugin_name }}/dist/"
Expand Down
5 changes: 3 additions & 2 deletions templates/github/.github/workflows/ci.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,11 @@ jobs:
mkdir -p "{{ plugin_name }}"
working-directory: "."
- name: "Download Deprecations"
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: "deprecations"
pattern: "deprecations-*"
path: "{{ plugin_name }}"
merge-multiple: true
- name: "Print deprecations"
run: |
cat deprecations-*.txt | sort -u
Expand Down
8 changes: 4 additions & 4 deletions templates/github/.github/workflows/nightly.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
steps:
{{ checkout(path=plugin_name) | indent(6) }}

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: "plugin_package"
path: "{{ plugin_name }}/dist/"
Expand All @@ -79,13 +79,13 @@ jobs:
{%- if publish_docs_to_pulpprojectdotorg and docs_test %}

- name: Download built docs
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: "docs.tar"
path: "{{ plugin_name }}"

- name: Download Python client docs
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: "python-client-docs.tar"
path: "{{ plugin_name }}"
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:

{{ checkout(repository="pulp/pulp-openapi-generator", path="pulp-openapi-generator") | indent(6) }}

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: "plugin_package"
path: "{{ plugin_name }}/dist/"
Expand Down
20 changes: 10 additions & 10 deletions templates/github/.github/workflows/publish.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

{{ setup_python() | indent(6) }}

- uses: "actions/download-artifact@v3"
- uses: "actions/download-artifact@v4"
with:
name: "plugin_package"
path: "{{ plugin_name }}/dist/"
Expand All @@ -64,22 +64,22 @@ jobs:

{%- for plugin in plugins %}
- name: "Upload python client packages"
uses: "actions/upload-artifact@v3"
uses: "actions/upload-artifact@v4"
with:
name: "python-client.tar"
path: "{{ plugin_name }}/{{ plugin.app_label }}-python-client.tar"
if-no-files-found: "error"

- name: "Upload python client docs"
uses: "actions/upload-artifact@v3"
uses: "actions/upload-artifact@v4"
with:
name: "python-client-docs.tar"
path: "{{ plugin_name }}/{{ plugin.app_label }}-python-client-docs.tar"
if-no-files-found: "error"

{%- if deploy_client_to_rubygems %}
- name: "Upload ruby client packages"
uses: "actions/upload-artifact@v3"
uses: "actions/upload-artifact@v4"
with:
name: "ruby-client.tar"
path: "{{ plugin_name }}/{{ plugin.app_label }}-ruby-client.tar"
Expand All @@ -96,7 +96,7 @@ jobs:
tar -cvf docs/docs.tar docs/_build

- name: "Upload built docs"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "docs.tar"
path: "{{ plugin_name }}/docs/docs.tar"
Expand All @@ -116,7 +116,7 @@ jobs:
steps:
{{ checkout(depth=1, path=plugin_name) | indent(6) }}

- uses: "actions/download-artifact@v3"
- uses: "actions/download-artifact@v4"
with:
name: "plugin_package"
path: "{{ plugin_name }}/dist/"
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
{{ checkout(depth=1, path=plugin_name) | indent(6) }}

- name: "Download Python client"
uses: "actions/download-artifact@v3"
uses: "actions/download-artifact@v4"
with:
name: "python-client.tar"
path: "{{ plugin_name }}/"
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
{{ checkout(depth=1, path=plugin_name) | indent(6) }}

- name: "Download Ruby client"
uses: "actions/download-artifact@v3"
uses: "actions/download-artifact@v4"
with:
name: "ruby-client.tar"
path: "{{ plugin_name }}/"
Expand Down Expand Up @@ -219,13 +219,13 @@ jobs:
{{ set_secrets() | indent(6) }}

- name: "Download built docs"
uses: "actions/download-artifact@v3"
uses: "actions/download-artifact@v4"
with:
name: "docs.tar"
path: "{{ plugin_name }}/"

- name: "Download Python client docs"
uses: "actions/download-artifact@v3"
uses: "actions/download-artifact@v4"
with:
name: "python-client-docs.tar"
path: "{{ plugin_name }}/"
Expand Down
14 changes: 7 additions & 7 deletions templates/github/.github/workflows/test.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:

{{ setup_python() | indent(6) }}

- uses: "actions/download-artifact@v3"
- uses: "actions/download-artifact@v4"
with:
name: "plugin_package"
path: "{{ plugin_name }}/dist/"
Expand Down Expand Up @@ -81,9 +81,9 @@ jobs:
docker logs pulp 2>&1 | grep -i pulpcore.deprecation | tee deprecations-{{ "${{ matrix.env.TEST }}" }}.txt

- name: "Upload Deprecations"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "deprecations"
name: "deprecations-{{ '${{ matrix.env.TEST }}' }}"
path: "{{ plugin_name }}/deprecations-{{ '${{ matrix.env.TEST }}' }}.txt"
if-no-files-found: "error"
retention-days: 5
Expand All @@ -92,7 +92,7 @@ jobs:
{%- for plugin in plugins %}
- name: Upload python client packages
if: {{ "${{ env.TEST == 'pulp' }}" }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "python-client.tar"
path: "{{ plugin_name }}/{{ plugin.app_label }}-python-client.tar"
Expand All @@ -101,7 +101,7 @@ jobs:

- name: Upload python client docs
if: {{ "${{ env.TEST == 'pulp' }}" }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "python-client-docs.tar"
path: "{{ plugin_name }}/{{ plugin.app_label }}-python-client-docs.tar"
Expand All @@ -111,7 +111,7 @@ jobs:
{%- if deploy_client_to_rubygems %}
- name: Upload Ruby client
if: {{ "${{ env.TEST == 'pulp' }}" }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "ruby-client.tar"
path: "{{ plugin_name }}/{{ plugin.app_label }}-ruby-client.tar"
Expand All @@ -123,7 +123,7 @@ jobs:
{%- if docs_test %}
- name: Upload built docs
if: {{ "${{ env.TEST == 'docs' }}" }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "docs.tar"
path: "{{ plugin_name }}/docs/docs.tar"
Expand Down
2 changes: 1 addition & 1 deletion templates/macros.j2
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ GITHUB_CONTEXT: "{{ '${{ github.event.pull_request.commits_url }}' }}"


{%- macro setup_python(pyversion=python_version) -%}
- uses: "actions/setup-python@v4"
- uses: "actions/setup-python@v5"
with:
python-version: "{{ pyversion }}"
{%- endmacro -%}
Expand Down

0 comments on commit 0b7d0c1

Please sign in to comment.