From 9daadf99bc1c76a469deba86bbf04ad5094888ce Mon Sep 17 00:00:00 2001 From: upbound-bot Date: Wed, 30 Sep 2026 09:46:25 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=94=84=20synced=20local=20'.github/wo?= =?UTF-8?q?rkflows'=20with=20remote=20'gitops/shared-files/configurations-?= =?UTF-8?q?new-devex/workflows'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yaml | 15 ++++++++++++--- .github/workflows/composition-tests.yaml | 4 ++-- .github/workflows/e2e.yaml | 14 +++----------- .github/workflows/tag.yml | 2 +- .github/workflows/yamllint.yaml | 2 +- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 190a5a7..439055f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,6 +14,7 @@ env: UP_API_TOKEN: ${{ secrets.UP_API_TOKEN }} UP_ROBOT_ID: ${{ secrets.UP_ROBOT_ID }} UP_ORG: ${{ secrets.UP_ORG }} + XPKG_REGISTRY: xpkg.upbound.io jobs: deploy: @@ -21,7 +22,7 @@ jobs: steps: - name: Checkout id: checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - name: Install and login with up if: env.UP_API_TOKEN != '' && env.UP_ORG != '' @@ -32,9 +33,10 @@ jobs: # doesn't work with plain token when pushing otherwise - name: Login to xpkg with robot - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4 + if: env.UP_API_TOKEN != '' && env.UP_ROBOT_ID != '' + uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4 with: - registry: xpkg.upbound.io + registry: ${{ env.XPKG_REGISTRY }} username: ${{ env.UP_ROBOT_ID }} password: ${{ env.UP_API_TOKEN }} @@ -46,3 +48,10 @@ jobs: tag: ${{ inputs.version || '' }} # login-check does `up org list` which doesn't work with a robot-token skip-login-check: true + + - name: Append icon overlay to package + if: env.UP_API_TOKEN != '' && hashFiles('./extensions') != '' && inputs.version != '' + run: | + PROJECT_NAME=$(yq '.metadata.name' upbound.yaml) + PACKAGE_REF="${{ env.XPKG_REGISTRY }}/${{ env.UP_ORG }}/${PROJECT_NAME}:${{ inputs.version }}" + up alpha xpkg append --extensions-root=./extensions ${PACKAGE_REF} diff --git a/.github/workflows/composition-tests.yaml b/.github/workflows/composition-tests.yaml index 104bcf7..2715ef5 100644 --- a/.github/workflows/composition-tests.yaml +++ b/.github/workflows/composition-tests.yaml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout id: checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - name: Install up uses: upbound/action-up@53fe6395637d884c80d2bbc8c2d75d0ece776ced # v1 @@ -23,4 +23,4 @@ jobs: run: up project build - name: Run composition tests - run: up test run tests/test-* + run: up test run tests/* diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index aacb74a..1aa1928 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -10,18 +10,10 @@ on: - labeled env: - # Build functions one at a time. Every Python function build mounts the same - # up-python-sdk-pip-cache Docker volume, and on a fresh runner - where that volume starts - # empty - concurrent builds race creating its directories and fail with - # "mkdir ...: file exists". - UP_MAX_CONCURRENCY: "1" UP_API_TOKEN: ${{ secrets.UP_E2E_API_TOKEN || secrets.UP_API_TOKEN }} UP_ORG: ${{ secrets.UP_E2E_ORG || secrets.UP_ORG }} UP_GROUP: ${{ secrets.UP_E2E_GROUP || secrets.UP_GROUP || 'default' }} UP_ROBOT_ID: ${{ secrets.UP_E2E_ROBOT_ID || secrets.UP_ROBOT_ID }} - # The space the e2e control plane is created in. Read by tests/e2etest-environment, which - # derives the Spaces API host from it, so this and the `up ctx` step below cannot drift. - UP_SPACE: ${{ secrets.UP_E2E_SPACE || 'upbound-gcp-us-central-1' }} jobs: e2e: @@ -30,7 +22,7 @@ jobs: steps: - name: Checkout id: checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 with: ref: ${{ github.event.pull_request.head.sha }} @@ -43,7 +35,7 @@ jobs: # doesn't work with plain token when pushing otherwise - name: Login to xpkg with robot - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4 + uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4 with: registry: xpkg.upbound.io username: ${{ env.UP_ROBOT_ID }} @@ -53,7 +45,7 @@ jobs: run: up project build - name: Switch up context - run: up ctx ${{ env.UP_ORG }}/${{ env.UP_SPACE }}/${{ env.UP_GROUP }} + run: up ctx ${{ env.UP_ORG }}/upbound-gcp-us-central-1/${{ env.UP_GROUP }} - name: Run e2e tests run: up test run tests/* --e2e diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index e54297e..e2dd5cf 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - name: Create Tag uses: negz/create-tag@39bae1e0932567a58c20dea5a1a0d18358503320 # v1 diff --git a/.github/workflows/yamllint.yaml b/.github/workflows/yamllint.yaml index d82d48c..ae49dff 100644 --- a/.github/workflows/yamllint.yaml +++ b/.github/workflows/yamllint.yaml @@ -5,7 +5,7 @@ jobs: name: runner / yamllint runs-on: ubuntu-latest steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - name: yamllint uses: reviewdog/action-yamllint@f01d8a48fd8d89f89895499fca2cff09f9e9e8c0 # v1.21.0 with: From d7b0b739409ba0c8379fb555cd19a3382aa24882 Mon Sep 17 00:00:00 2001 From: upbound-bot Date: Wed, 30 Sep 2026 09:46:25 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=94=84=20synced=20local=20'.yamllint'?= =?UTF-8?q?=20with=20remote=20'gitops/shared-files/configurations-new-deve?= =?UTF-8?q?x/.yamllint'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .yamllint | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.yamllint b/.yamllint index 0c59b35..1fd3784 100644 --- a/.yamllint +++ b/.yamllint @@ -4,5 +4,4 @@ rules: line-length: disable document-start: disable indentation: - spaces: consistent - indent-sequences: false + indent-sequences: consistent