From 81d751565dd27fa4008a735f80c67a8eaed859be Mon Sep 17 00:00:00 2001 From: Jeff Kala Date: Tue, 25 Aug 2026 16:12:15 -0600 Subject: [PATCH 1/3] Fix release bug, and bump checkout action --- .github/workflows/ci.yml | 18 +++++++++--------- .github/workflows/oui_filepull.yml | 4 ++-- .github/workflows/prepare_release.yml | 2 +- .github/workflows/proto_filepull.yml | 4 ++-- .github/workflows/proto_num_filepull.yml | 4 ++-- .github/workflows/release.yml | 7 ++++--- changes/+checkout-action.housekeeping | 1 + changes/893.fixed | 1 + 8 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 changes/+checkout-action.housekeeping create mode 100644 changes/893.fixed diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e63747eb..ca0b43db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: INVOKE_NETUTILS_LOCAL: "True" steps: - name: "Check out repository code" - uses: "actions/checkout@v4" + uses: "actions/checkout@v7" - name: "Setup environment" uses: "networktocode/gh-action-setup-poetry-environment@v7" with: @@ -34,7 +34,7 @@ jobs: INVOKE_NETUTILS_LOCAL: "True" steps: - name: "Check out repository code" - uses: "actions/checkout@v4" + uses: "actions/checkout@v7" - name: "Setup environment" uses: "networktocode/gh-action-setup-poetry-environment@v7" with: @@ -47,7 +47,7 @@ jobs: INVOKE_NETUTILS_LOCAL: "True" steps: - name: "Check out repository code" - uses: "actions/checkout@v4" + uses: "actions/checkout@v7" - name: "Setup environment" uses: "networktocode/gh-action-setup-poetry-environment@v6" with: @@ -63,7 +63,7 @@ jobs: INVOKE_NETUTILS_LOCAL: "True" steps: - name: "Check out repository code" - uses: "actions/checkout@v4" + uses: "actions/checkout@v7" - name: "Setup environment" uses: "networktocode/gh-action-setup-poetry-environment@v7" with: @@ -77,7 +77,7 @@ jobs: INVOKE_NETUTILS_LOCAL: "True" steps: - name: "Check out repository code" - uses: "actions/checkout@v4" + uses: "actions/checkout@v7" - name: "Setup environment" uses: "networktocode/gh-action-setup-poetry-environment@v7" with: @@ -90,7 +90,7 @@ jobs: INVOKE_NETUTILS_LOCAL: "True" steps: - name: "Check out repository code" - uses: "actions/checkout@v4" + uses: "actions/checkout@v7" - name: "Setup environment" uses: "networktocode/gh-action-setup-poetry-environment@v7" with: @@ -112,7 +112,7 @@ jobs: INVOKE_NETUTILS_PYTHON_VER: "${{ matrix.python-version }}" steps: - name: "Check out repository code" - uses: "actions/checkout@v4" + uses: "actions/checkout@v7" - name: "Setup environment" uses: "networktocode/gh-action-setup-poetry-environment@v7" with: @@ -149,7 +149,7 @@ jobs: INVOKE_NETUTILS_PYTHON_VER: "${{ matrix.python-version }}" steps: - name: "Check out repository code" - uses: "actions/checkout@v4" + uses: "actions/checkout@v7" - name: "Setup environment" uses: "networktocode/gh-action-setup-poetry-environment@v7" with: @@ -181,7 +181,7 @@ jobs: runs-on: "ubuntu-latest" steps: - name: "Check out repository code" - uses: "actions/checkout@v4" + uses: "actions/checkout@v7" with: fetch-depth: "0" - name: "Setup environment" diff --git a/.github/workflows/oui_filepull.yml b/.github/workflows/oui_filepull.yml index 0f9eae40..9124088b 100644 --- a/.github/workflows/oui_filepull.yml +++ b/.github/workflows/oui_filepull.yml @@ -13,7 +13,7 @@ jobs: BRANCH_NAME: "OUI_Updates" steps: - name: "Check out code" - uses: "actions/checkout@v4" + uses: "actions/checkout@v7" with: ref: "develop" fetch-depth: 0 @@ -73,7 +73,7 @@ jobs: steps: # Checkout repo - name: "Check out code" - uses: "actions/checkout@v4" + uses: "actions/checkout@v7" with: ref: "OUI_Updates" # Create PR from branch created above into develop diff --git a/.github/workflows/prepare_release.yml b/.github/workflows/prepare_release.yml index 1a70ab5b..abb283a6 100644 --- a/.github/workflows/prepare_release.yml +++ b/.github/workflows/prepare_release.yml @@ -35,7 +35,7 @@ jobs: runs-on: "ubuntu-latest" steps: - name: "Checkout code" - uses: "actions/checkout@v4" + uses: "actions/checkout@v7" with: # If target_branch is 'main', use 'develop' as the source branch. Otherwise, the source and target branch are the same. ref: "${{ github.event.inputs['target_branch'] == 'main' && 'develop' || github.event.inputs['target_branch'] }}" diff --git a/.github/workflows/proto_filepull.yml b/.github/workflows/proto_filepull.yml index 5f958249..1c2e9fc0 100644 --- a/.github/workflows/proto_filepull.yml +++ b/.github/workflows/proto_filepull.yml @@ -13,7 +13,7 @@ jobs: steps: # Checkout repo - name: "Check out code" - uses: "actions/checkout@v4" + uses: "actions/checkout@v7" with: ref: "develop" # Delete old branch if it exists @@ -46,7 +46,7 @@ jobs: steps: # Checkout repo - name: "Check out code" - uses: "actions/checkout@v4" + uses: "actions/checkout@v7" with: ref: "PROTO_Updates" # Create PR from branch created above into develop diff --git a/.github/workflows/proto_num_filepull.yml b/.github/workflows/proto_num_filepull.yml index c19fcb96..d6b9209a 100644 --- a/.github/workflows/proto_num_filepull.yml +++ b/.github/workflows/proto_num_filepull.yml @@ -13,7 +13,7 @@ jobs: steps: # Checkout repo - name: "Check out code" - uses: "actions/checkout@v4" + uses: "actions/checkout@v7" with: ref: "develop" # Delete old branch if it exists @@ -46,7 +46,7 @@ jobs: steps: # Checkout repo - name: "Check out code" - uses: "actions/checkout@v4" + uses: "actions/checkout@v7" with: ref: "PROTO_NUM_Updates" # Create PR from branch created above into develop diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a1455227..56670222 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,6 +7,7 @@ on: # yamllint disable-line rule:truthy rule:comments env: POETRY_VERSION: "2.1.3" PYTHON_VERSION: "3.12" + INVOKE_NETUTILS_LOCAL: "True" jobs: build: @@ -14,7 +15,7 @@ jobs: runs-on: "ubuntu-latest" if: "startsWith(github.ref, 'refs/tags/v')" steps: - - uses: "actions/checkout@v4" + - uses: "actions/checkout@v7" - name: "Setup environment" uses: "networktocode/gh-action-setup-poetry-environment@v7" with: @@ -44,7 +45,7 @@ jobs: contents: "write" needs: "build" steps: - - uses: "actions/checkout@v4" + - uses: "actions/checkout@v7" - name: "Retrieve built package from cache" uses: "actions/download-artifact@v4" with: @@ -121,7 +122,7 @@ jobs: runs-on: "ubuntu-latest" steps: - name: "Checkout source branch" - uses: "actions/checkout@v4" + uses: "actions/checkout@v7" with: ref: "${{ github.event.release.target_commitish }}" fetch-depth: 0 diff --git a/changes/+checkout-action.housekeeping b/changes/+checkout-action.housekeeping new file mode 100644 index 00000000..05e0929d --- /dev/null +++ b/changes/+checkout-action.housekeeping @@ -0,0 +1 @@ +Upgrade GitHub actions/checkout@v4 to @v7. diff --git a/changes/893.fixed b/changes/893.fixed new file mode 100644 index 00000000..25c2ebf1 --- /dev/null +++ b/changes/893.fixed @@ -0,0 +1 @@ +Fixed the release process failing due to missing local environment invoke variable. From e99e42e7ef747b8517385718619c1a0a769c41bc Mon Sep 17 00:00:00 2001 From: Jeff Kala Date: Tue, 25 Aug 2026 16:29:48 -0600 Subject: [PATCH 2/3] update to newer docker actions for buildx and builds --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca0b43db..52de9d5b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: - name: "Check out repository code" uses: "actions/checkout@v7" - name: "Setup environment" - uses: "networktocode/gh-action-setup-poetry-environment@v6" + uses: "networktocode/gh-action-setup-poetry-environment@v7" with: python-version: "3.13" - name: "Type-Hints: mypy" @@ -121,9 +121,9 @@ jobs: run: "echo INVOKE_NETUTILS_IMAGE_VER=`poetry version -s`-py${{ matrix.python-version }} >> $GITHUB_ENV" - name: "Set up Docker Buildx" id: "buildx" - uses: "docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2" # v3.10.0 + uses: "docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e" # v4.3.0 - name: "Build" - uses: "docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25" # v5.4.0 + uses: "docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a" # v7.3.0 with: builder: "${{ steps.buildx.outputs.name }}" context: "./" @@ -158,9 +158,9 @@ jobs: run: "echo INVOKE_NETUTILS_IMAGE_VER=`poetry version -s`-py${{ matrix.python-version }} >> $GITHUB_ENV" - name: "Set up Docker Buildx" id: "buildx" - uses: "docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2" # v3.10.0 + uses: "docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e" # v4.3.0 - name: "Build" - uses: "docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25" # v5.4.0 + uses: "docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a" # v7.3.0 with: builder: "${{ steps.buildx.outputs.name }}" context: "./" From ec87993ba6830cde93bb2739282baab48e667bf0 Mon Sep 17 00:00:00 2001 From: Jeff Kala Date: Wed, 26 Aug 2026 07:46:44 -0600 Subject: [PATCH 3/3] streamline pytest ci testing to be local as pylint is already checked in docker --- .github/workflows/ci.yml | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 52de9d5b..00cd9d5e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,7 +107,7 @@ jobs: strategy: fail-fast: true matrix: - python-version: ["3.10"] + python-version: ["3.10", "3.14"] env: INVOKE_NETUTILS_PYTHON_VER: "${{ matrix.python-version }}" steps: @@ -147,6 +147,7 @@ jobs: runs-on: "ubuntu-latest" env: INVOKE_NETUTILS_PYTHON_VER: "${{ matrix.python-version }}" + INVOKE_NETUTILS_LOCAL: "True" steps: - name: "Check out repository code" uses: "actions/checkout@v7" @@ -154,24 +155,6 @@ jobs: uses: "networktocode/gh-action-setup-poetry-environment@v7" with: poetry-version: "2.1.3" - - name: "Get image version" - run: "echo INVOKE_NETUTILS_IMAGE_VER=`poetry version -s`-py${{ matrix.python-version }} >> $GITHUB_ENV" - - name: "Set up Docker Buildx" - id: "buildx" - uses: "docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e" # v4.3.0 - - name: "Build" - uses: "docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a" # v7.3.0 - with: - builder: "${{ steps.buildx.outputs.name }}" - context: "./" - push: false - load: true - tags: "${{ env.INVOKE_NETUTILS_IMAGE_NAME }}:${{ env.INVOKE_NETUTILS_IMAGE_VER }}" - file: "./Dockerfile" - cache-from: "type=gha,scope=${{ env.INVOKE_NETUTILS_IMAGE_NAME }}-${{ env.INVOKE_NETUTILS_IMAGE_VER }}-py${{ matrix.python-version }}" - cache-to: "type=gha,scope=${{ env.INVOKE_NETUTILS_IMAGE_NAME }}-${{ env.INVOKE_NETUTILS_IMAGE_VER }}-py${{ matrix.python-version }}" - build-args: | - PYTHON_VER=${{ matrix.python-version }} - name: "Run Tests" run: "poetry run invoke pytest" changelog: