From 70e95e1be890651d5075390fc27ccda8ebcdb4cb Mon Sep 17 00:00:00 2001 From: pulpbot Date: Tue, 28 Nov 2023 05:03:40 +0000 Subject: [PATCH] Update CI files [noissue] --- .github/template_gitref | 2 +- .github/workflows/ci.yml | 3 +-- .github/workflows/codeql-analysis.yml | 16 ++++++++-------- .github/workflows/kanban.yml | 2 +- .github/workflows/lint.yml | 4 ++++ .github/workflows/nightly.yml | 15 ++++++--------- .github/workflows/release.yml | 4 ++-- .github/workflows/update-labels.yml | 10 +++++----- .github/workflows/update_ci.yml | 1 - lint_requirements.txt | 2 +- 10 files changed, 29 insertions(+), 30 deletions(-) diff --git a/.github/template_gitref b/.github/template_gitref index b5a481aa8..99cbe1000 100644 --- a/.github/template_gitref +++ b/.github/template_gitref @@ -1 +1 @@ -2021.08.26-276-g45ce134 +2021.08.26-278-g22c5b00 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dce4ef514..2afb16bd4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,6 +52,7 @@ jobs: test: needs: build uses: "./.github/workflows/test.yml" + deprecations: defaults: run: @@ -73,5 +74,3 @@ jobs: echo "${{ needs.test.outputs.deprecations-azure }}" | base64 -d echo "${{ needs.test.outputs.deprecations-s3 }}" | base64 -d echo "${{ needs.test.outputs.deprecations-lowerbounds }}" | base64 -d - - diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index ad4ca4b9c..0f2121f3a 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -30,13 +30,13 @@ jobs: language: [ 'python' ] steps: - - name: Checkout repository - uses: actions/checkout@v3 + - name: Checkout repository + uses: actions/checkout@v3 - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - with: - languages: ${{ matrix.language }} + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/kanban.yml b/.github/workflows/kanban.yml index dba81732b..60b81c374 100644 --- a/.github/workflows/kanban.yml +++ b/.github/workflows/kanban.yml @@ -58,7 +58,7 @@ jobs: runs-on: ubuntu-latest name: Find issues linked to a PR outputs: - linked-issues: ${{ steps.linked-issues.outputs.issues }} + linked-issues: ${{ steps.linked-issues.outputs.issues }} steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index eb96b6a59..a6f90e593 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -32,6 +32,10 @@ jobs: - name: Install requirements run: pip3 install -r lint_requirements.txt + - name: Lint workflow files + run: | + yamllint -s -d '{extends: relaxed, rules: {line-length: disable}}' .github/workflows + # run black separately from flake8 to get a diff - name: Run black run: | diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index f90484a1b..298d5f655 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -27,7 +27,6 @@ jobs: uses: "./.github/workflows/build.yml" test: - runs-on: "ubuntu-latest" needs: "build" uses: "./.github/workflows/test.yml" @@ -77,12 +76,6 @@ jobs: fetch-depth: 1 path: "pulp_ansible" - - uses: actions/checkout@v4 - with: - fetch-depth: 1 - repository: "pulp/pulp-openapi-generator" - path: "pulp-openapi-generator" - - uses: actions/download-artifact@v3 with: name: "plugin_package" @@ -92,11 +85,16 @@ jobs: with: python-version: "3.8" + - name: Install python dependencies + run: | + echo ::group::PYDEPS + pip install requests + echo ::endgroup:: + - name: Set environment variables run: | echo "TEST=${{ matrix.env.TEST }}" >> $GITHUB_ENV - - name: Download built docs uses: actions/download-artifact@v3 with: @@ -118,7 +116,6 @@ jobs: run: | tar -xvf docs.tar -C ./docs .github/workflows/scripts/publish_docs.sh nightly ${GITHUB_REF##*/} - - name: Logs if: always() diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 262e2298a..a3ca7be7f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -268,9 +268,9 @@ jobs: env: TAG_NAME: ${{ inputs.release }} with: - const { TAG_NAME } = process.env; - script: | + const { TAG_NAME } = process.env; + await github.rest.repos.createRelease({ owner: context.repo.owner, repo: context.repo.repo, diff --git a/.github/workflows/update-labels.yml b/.github/workflows/update-labels.yml index 56dadb803..ad9399411 100644 --- a/.github/workflows/update-labels.yml +++ b/.github/workflows/update-labels.yml @@ -7,13 +7,13 @@ --- -name: Ansible Update Labels +name: "Ansible Update Labels" on: push: branches: - - main + - "main" paths: - - 'template_config.yml' + - "template_config.yml" jobs: update_backport_labels: @@ -31,8 +31,8 @@ jobs: echo ::group::PYDEPS pip install requests pyyaml echo ::endgroup:: - - uses: actions/checkout@v3 - - name: Update labels + - uses: "actions/checkout@v3" + - name: "Update labels" run: | python3 .github/workflows/scripts/update_backport_labels.py env: diff --git a/.github/workflows/update_ci.yml b/.github/workflows/update_ci.yml index a0a1bca19..1e5cbcc68 100644 --- a/.github/workflows/update_ci.yml +++ b/.github/workflows/update_ci.yml @@ -13,7 +13,6 @@ on: # * is a special character in YAML so you have to quote this string # runs at 2:30 UTC every Sunday - cron: '30 2 * * 0' - workflow_dispatch: jobs: diff --git a/lint_requirements.txt b/lint_requirements.txt index eb78f54de..3b3a1bdf3 100644 --- a/lint_requirements.txt +++ b/lint_requirements.txt @@ -10,4 +10,4 @@ black check-manifest flake8 flake8-black - +yamllint