Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ci and make file #38

Closed
wants to merge 1 commit into from
Closed

Update ci and make file #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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##*/}
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/crossplane-contrib/provider-keycloak
module github.com/stakater/provider-keycloak

go 1.21

Expand Down