Skip to content

Commit

Permalink
Revert GH action change and fix makefile (#2350)
Browse files Browse the repository at this point in the history
Signed-off-by: Jorge Turrado <[email protected]>
  • Loading branch information
Jorge Turrado Ferrero authored Nov 25, 2021
1 parent cff3a44 commit 22d7163
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 deletions.
17 changes: 7 additions & 10 deletions .github/workflows/release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,26 +52,23 @@ jobs:
run: echo $DOCKER_HUB_ACCESS_TOKEN | docker login -u $DOCKER_HUB_USERNAME --password-stdin

- name: Get the version
uses: little-core-labs/[email protected]
id: get_version
with:
tagRegex: "v(.*)"
tagRegexGroup: 1
run: echo ::set-output name=VERSION::${GITHUB_REF#refs/tags/v}

- name: Release Deployment YAML file
run: make release
env:
VERSION: ${{ steps.get_version.outputs.tag }}
VERSION: ${{ steps.get_version.outputs.VERSION }}

- name: Publish KEDA images on GitHub Container Registry
run: make publish
env:
VERSION: ${{ steps.get_version.outputs.tag }}
VERSION: ${{ steps.get_version.outputs.VERSION }}

- name: Publish KEDA images on Docker Hub
run: make publish-dockerhub
env:
VERSION: ${{ steps.get_version.outputs.tag }}
VERSION: ${{ steps.get_version.outputs.VERSION }}

# Get release information to determine id of the current release
- name: Get Release
Expand All @@ -87,7 +84,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: https://uploads.github.com/repos/kedacore/keda/releases/${{ steps.get-release-info.outputs.id }}/assets?name=keda-${{ steps.get_version.outputs.tag }}.yaml
asset_path: keda-${{ steps.get_version.outputs.tag }}.yaml
asset_name: keda-${{ steps.get_version.outputs.tag }}.yaml
upload_url: https://uploads.github.com/repos/kedacore/keda/releases/${{ steps.get-release-info.outputs.id }}/assets?name=keda-${{ steps.get_version.outputs.VERSION }}.yaml
asset_path: keda-${{ steps.get_version.outputs.VERSION }}.yaml
asset_name: keda-${{ steps.get_version.outputs.VERSION }}.yaml
asset_content_type: application/x-yaml
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ SHELL = /bin/bash

# If E2E_IMAGE_TAG is defined, we are on pr e2e test and we have to use the new tag and append -test to the repository
ifeq '${E2E_IMAGE_TAG}' ''
VERSION = main
VERSION ?= main
# SUFIX here is intentional empty to not append nothing to the repository
SUFFIX =
endif
Expand Down

0 comments on commit 22d7163

Please sign in to comment.