Skip to content

Commit

Permalink
fix: Asset Uploading (#152)
Browse files Browse the repository at this point in the history
<!-- Thank you for your contribution. Before you submit the pull
request:
1. Follow contributing guidelines, templates, the recommended Git
workflow, and any related documentation.
2. Read and submit the required Contributor Licence Agreements
(https://github.com/kyma-project/community/blob/main/CONTRIBUTING.md#agreements-and-licenses).
3. Test your changes and attach their results to the pull request.
4. Update the relevant documentation.

If the pull request requires a decision, follow the [decision-making
process](https://github.com/kyma-project/community/blob/main/governance.md)
and replace the PR template with the [decision record
template](https://github.com/kyma-project/community/blob/main/.github/ISSUE_TEMPLATE/decision-record.md).
-->

**Description**

Changes proposed in this pull request:

- Fix the selection of Kyma CLI (this will fix the asset uploading Prow
Job)
- Set Version to 0.1.2 to enable new release

**Related issue(s)**
<!-- If you refer to a particular issue, provide its number. For
example, `Resolves #123`, `Fixes #43`, or `See also #33`. -->
Closes #52
  • Loading branch information
LeelaChacha authored Feb 12, 2024
1 parent 21d8e24 commit a37bfb1
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
MODULE_VERSION=0.1.0
MODULE_VERSION=0.1.2
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ define os_error
$(error Error: unsuported platform OS_TYPE:$1, OS_ARCH:$2; to mitigate this problem set variable KYMA with absolute path to kyma-cli binary compatible with your operating system and architecture)
endef

KYMA_FILE_NAME ?= $(shell ./scripts/local/get_kyma_file_name.sh ${OS_TYPE} ${OS_ARCH})
KYMA_FILE_NAME ?= $(shell ./scripts/local/get_kyma_file_name.sh)
KYMA ?= $(LOCALBIN)/kyma-$(KYMA_STABILITY)

.PHONY: kyma
Expand Down
2 changes: 1 addition & 1 deletion module-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: kyma-project.io/module/template-operator
channel: regular
version: 0.1.0
version: 0.1.2
manifest: template-operator.yaml
security: sec-scanners-config.yaml
defaultCR: ./config/samples/default-sample-cr.yaml
Expand Down
7 changes: 3 additions & 4 deletions scripts/local/get_kyma_file_name.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
#!/bin/bash

function get_kyma_file_name () {

local _OS_TYPE=$1
local _OS_ARCH=$2
_OS_TYPE="$(uname -s)"
_OS_ARCH="$(uname -m)"

[ "$_OS_TYPE" == "Linux" ] && [ "$_OS_ARCH" == "x86_64" ] && echo "kyma-linux" ||
[ "$_OS_TYPE" == "Linux" ] && [ "$_OS_ARCH" == "arm64" ] && echo "kyma-linux-arm" ||
Expand All @@ -12,4 +11,4 @@ function get_kyma_file_name () {
[ "$_OS_TYPE" == "Darwin" ] && [ "$_OS_ARCH" == "x86_64" ] && echo "kyma-darwin"
}

get_kyma_file_name "$@"
get_kyma_file_name
4 changes: 2 additions & 2 deletions sec-scanners-config.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module-name: template-operator
rc-tag: 0.1.0
rc-tag: 0.1.2
dev-branch: main
protecode:
- europe-docker.pkg.dev/kyma-project/prod/template-operator:0.1.0
- europe-docker.pkg.dev/kyma-project/prod/template-operator:0.1.2
whitesource:
language: golang-mod
subprojects: false
Expand Down

0 comments on commit a37bfb1

Please sign in to comment.