From a35f7a7e78304a78614be7e7a74bd6a702ed428f Mon Sep 17 00:00:00 2001 From: Mustafa Date: Tue, 23 Jan 2024 16:53:18 +0500 Subject: [PATCH] update ci and make file --- .github/workflows/ci.yml | 22 +++++++++++++--------- Makefile | 8 ++++---- go.mod | 2 +- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9cd59c52..2f6ab555 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ env: # step 'if env.XXX != ""', so we copy these to succinctly test whether # credentials have been provided before trying to run steps that need them. UPBOUND_MARKETPLACE_PUSH_ROBOT_USR: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR }} - + UPBOUND_MARKETPLACE_PUSH_ROBOT_PSW: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_PSW }} jobs: detect-noop: runs-on: ubuntu-22.04 @@ -230,13 +230,13 @@ jobs: version: ${{ env.DOCKER_BUILDX_VERSION }} install: true - - name: Login to Upbound - uses: docker/login-action@v2 - if: env.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR != '' - with: - registry: xpkg.upbound.io - username: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR }} - password: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_PSW }} +# - name: Login to Upbound +# uses: docker/login-action@v2 +# if: env.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR != '' +# with: +# registry: xpkg.upbound.io +# username: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_USR }} +# password: ${{ secrets.UPBOUND_MARKETPLACE_PUSH_ROBOT_PSW }} - name: Checkout uses: actions/checkout@v2 @@ -286,4 +286,8 @@ jobs: path: _output/** - name: Publish Artifacts - run: make publish BRANCH_NAME=${GITHUB_REF##*/} + run: | + curl -sL "https://cli.upbound.io" | sh + sudo mv up /usr/local/bin/ + up login -u $UPBOUND_MARKETPLACE_PUSH_ROBOT_USR -p $UPBOUND_MARKETPLACE_PUSH_ROBOT_PSW + make publish BRANCH_NAME=${GITHUB_REF##*/} diff --git a/Makefile b/Makefile index 42a08e52..cffd7b75 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # Setup Project PROJECT_NAME ?= provider-keycloak -PROJECT_REPO ?= github.com/crossplane-contrib/$(PROJECT_NAME) +PROJECT_REPO ?= github.com/stakater/$(PROJECT_NAME) export TERRAFORM_VERSION ?= 1.4.6 @@ -58,17 +58,17 @@ UP_CHANNEL = stable # ==================================================================================== # Setup Images -REGISTRY_ORGS ?= xpkg.upbound.io/upbound +REGISTRY_ORGS ?= xpkg.upbound.io/stakater IMAGES = $(PROJECT_NAME) -include build/makelib/imagelight.mk # ==================================================================================== # Setup XPKG -XPKG_REG_ORGS ?= xpkg.upbound.io/crossplane-contrib +XPKG_REG_ORGS ?= xpkg.upbound.io/stakater # NOTE(hasheddan): skip promoting on xpkg.upbound.io as channel tags are # inferred. -XPKG_REG_ORGS_NO_PROMOTE ?= xpkg.upbound.io/crossplane-contrib +XPKG_REG_ORGS_NO_PROMOTE ?= xpkg.upbound.io/stakater XPKGS = $(PROJECT_NAME) -include build/makelib/xpkg.mk diff --git a/go.mod b/go.mod index ac6a1962..7efebed4 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/crossplane-contrib/provider-keycloak +module github.com/stakater/provider-keycloak go 1.21