Skip to content

Commit 66d89b6

Browse files
committed
Push to xpkg.crossplane.io, not xpkg.upbound.io
Signed-off-by: Nic Cope <[email protected]>
1 parent 73829ab commit 66d89b6

File tree

1 file changed

+11
-17
lines changed

1 file changed

+11
-17
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,14 @@ env:
2020

2121
# These environment variables are important to the Crossplane CLI install.sh
2222
# script. They determine what version it installs.
23-
XP_CHANNEL: master # TODO(negz): Pin to stable once v1.14 is released.
24-
XP_VERSION: current # TODO(negz): Pin to a version once v1.14 is released.
25-
26-
# This CI job will automatically push new builds to xpkg.upbound.io if the
27-
# XPKG_ACCESS_ID and XPKG_TOKEN secrets are set in the GitHub respository (or
28-
# organization) settings. Create a token at https://accounts.upbound.io.
29-
XPKG_ACCESS_ID: ${{ secrets.XPKG_ACCESS_ID }}
23+
XP_CHANNEL: stable
24+
XP_VERSION: v1.20.0
3025

3126
# The package to push, without a version tag. The default matches GitHub. For
32-
# example xpkg.upbound.io/crossplane/function-template-go.
33-
XPKG: xpkg.upbound.io/${{ github.repository}}
27+
# example xpkg.crossplane.io/crossplane/function-template-go. Note that
28+
# xpkg.crossplane.io is just an alias for ghcr.io, so we upload to ghcr.io but
29+
# this'll be pulled from xpkg.crossplane.io.
30+
XPKG: ghcr.io/${{ github.repository}}
3431

3532
# The package version to push. The default is 0.0.0-gitsha.
3633
XPKG_VERSION: ${{ inputs.version }}
@@ -127,8 +124,7 @@ jobs:
127124
retention-days: 1
128125

129126
# This job downloads the single-platform packages built by the build job, and
130-
# pushes them as a multi-platform package. We only push the package it the
131-
# XPKG_ACCESS_ID and XPKG_TOKEN secrets were provided.
127+
# pushes them as a multi-platform package.
132128
push:
133129
runs-on: ubuntu-24.04
134130
needs:
@@ -148,13 +144,12 @@ jobs:
148144
- name: Setup the Crossplane CLI
149145
run: "curl -sL https://raw.githubusercontent.com/crossplane/crossplane/master/install.sh | sh"
150146

151-
- name: Login to Upbound
147+
- name: Login to GitHub Container Registry
152148
uses: docker/login-action@v3
153-
if: env.XPKG_ACCESS_ID != ''
154149
with:
155150
registry: xpkg.upbound.io
156-
username: ${{ secrets.XPKG_ACCESS_ID }}
157-
password: ${{ secrets.XPKG_TOKEN }}
151+
username: ${{ github.repository_owner }}
152+
password: ${{ secrets.GITHUB_TOKEN }}
158153

159154
# If a version wasn't explicitly passed as a workflow_dispatch input we
160155
# default to version v0.0.0-<git-commit-date>-<git-short-sha>, for example
@@ -164,6 +159,5 @@ jobs:
164159
if: env.XPKG_VERSION == ''
165160
run: echo "XPKG_VERSION=v0.0.0-$(date -d@$(git show -s --format=%ct) +%Y%m%d%H%M%S)-$(git rev-parse --short=12 HEAD)" >> $GITHUB_ENV
166161

167-
- name: Push Multi-Platform Package to Upbound
168-
if: env.XPKG_ACCESS_ID != ''
162+
- name: Push Multi-Platform Package to GitHub Container Registry
169163
run: "./crossplane --verbose xpkg push --package-files $(echo *.xpkg|tr ' ' ,) ${{ env.XPKG }}:${{ env.XPKG_VERSION }}"

0 commit comments

Comments
 (0)