diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b0abb34..ecbf3cd 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@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6 - name: Install and login with up if: env.UP_API_TOKEN != '' && env.UP_ORG != '' @@ -34,7 +35,7 @@ jobs: - name: Login to xpkg with robot uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3 with: - registry: xpkg.upbound.io + registry: ${{ env.XPKG_REGISTRY }} username: ${{ env.UP_ROBOT_ID }} password: ${{ env.UP_API_TOKEN }} @@ -46,3 +47,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 4529df0..18ecd9e 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@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6 - name: Install up uses: upbound/action-up@53fe6395637d884c80d2bbc8c2d75d0ece776ced # v1 diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index f6f965d..6a6ae85 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -22,7 +22,7 @@ jobs: steps: - name: Checkout id: checkout - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6 with: ref: ${{ github.event.pull_request.head.sha }} diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index f29d12e..f6c942b 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6 - name: Create Tag uses: negz/create-tag@39bae1e0932567a58c20dea5a1a0d18358503320 # v1 diff --git a/.github/workflows/yamllint.yaml b/.github/workflows/yamllint.yaml index be2ab4d..92d8fad 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@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6 - name: yamllint uses: reviewdog/action-yamllint@f01d8a48fd8d89f89895499fca2cff09f9e9e8c0 # v1.21.0 with: diff --git a/.yamllint b/.yamllint index 669c864..1fd3784 100644 --- a/.yamllint +++ b/.yamllint @@ -3,3 +3,5 @@ extends: default rules: line-length: disable document-start: disable + indentation: + indent-sequences: consistent