Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge f1a7844 into 5239a1a
Browse files Browse the repository at this point in the history
feloy authored May 30, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 5239a1a + f1a7844 commit 339c51b
Showing 22 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ LABEL com.redhat.component=atomic-openshift-odo-cli-artifacts-container \
summary="This image contains the Linux, Mac and Windows version of odo"

# Change version as needed. Note no "-" is allowed
LABEL version=3.10.0
LABEL version=3.11.0

COPY --from=builder /go/src/github.com/redhat-developer/odo/dist/bin/darwin-amd64/odo /usr/share/redhat-developer/odo/mac/odo
COPY --from=builder /go/src/github.com/redhat-developer/odo/dist/bin/windows-amd64/odo.exe /usr/share/redhat-developer/odo/windows/odo.exe
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ $ odo init --devfile nodejs-react --name my-nr-app
__
/ \__ Initializing a new component
\__/ \
/ \__/ odo version: v3.10.0
/ \__/ odo version: v3.11.0
\__/

✓ Downloading devfile "nodejs-react" [3s]
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ $ odo init --name my-spring-app --devfile java-springboot --devfile-registry Def
__
/ \__ Initializing a new component
\__/ \
/ \__/ odo version: v3.10.0
/ \__/ odo version: v3.11.0
\__/

✓ Downloading devfile "java-springboot" from registry "DefaultDevfileRegistry" [4s]
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ $ odo init --devfile-path https://registry.devfile.io/devfiles/nodejs-angular --
__
/ \__ Initializing a new component
\__/ \
/ \__/ odo version: v3.10.0
/ \__/ odo version: v3.11.0
\__/

✓ Downloading devfile from "https://registry.devfile.io/devfiles/nodejs-angular" [1s]
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ $ odo init
__
/ \__ Initializing a new component
\__/ \ Files: Source code detected, a Devfile will be determined based upon source code autodetection
/ \__/ odo version: v3.10.0
/ \__/ odo version: v3.11.0
\__/

Interactive mode enabled, please answer the following questions:
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ $ odo init
__
/ \__ Initializing a new component
\__/ \ Files: No source code detected, a starter project will be created in the current directory
/ \__/ odo version: v3.10.0
/ \__/ odo version: v3.11.0
\__/

Interactive mode enabled, please answer the following questions:
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ $ odo init --devfile go --name my-go-app --devfile-version latest
__
/ \__ Initializing a new component
\__/ \
/ \__/ odo version: v3.10.0
/ \__/ odo version: v3.11.0
\__/

✓ Downloading devfile "go:latest" [4s]
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ $ odo init --devfile go --name my-go-app --devfile-version 2.0.0
__
/ \__ Initializing a new component
\__/ \
/ \__/ odo version: v3.10.0
/ \__/ odo version: v3.11.0
\__/

✓ Downloading devfile "go:2.0.0" [3s]
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ $ odo deploy
__
/ \__ Deploying the application using my-dotnet-app Devfile
\__/ \ Namespace: odo-dev
/ \__/ odo version: v3.10.0
/ \__/ odo version: v3.11.0
\__/

↪ Building & Pushing Container: quay.io/MYUSERNAME/dotnet-odo-example
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ $ odo deploy
__
/ \__ Deploying the application using my-go-app Devfile
\__/ \ Namespace: odo-dev
/ \__/ odo version: v3.10.0
/ \__/ odo version: v3.11.0
\__/

↪ Building & Pushing Container: quay.io/MYUSERNAME/go-odo-example
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ $ odo deploy
__
/ \__ Deploying the application using my-java-app Devfile
\__/ \ Namespace: odo-dev
/ \__/ odo version: v3.10.0
/ \__/ odo version: v3.11.0
\__/

↪ Building & Pushing Container: quay.io/MYUSERNAME/java-odo-example
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ $ odo deploy
__
/ \__ Deploying the application using my-nodejs-app Devfile
\__/ \ Namespace: odo-dev
/ \__/ odo version: v3.10.0
/ \__/ odo version: v3.11.0
\__/

↪ Building & Pushing Container: quay.io/MYUSERNAME/nodejs-odo-example
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ $ odo dev
__
/ \__ Developing using the "my-dotnet-app" Devfile
\__/ \ Namespace: odo-dev
/ \__/ odo version: v3.10.0
/ \__/ odo version: v3.11.0
\__/

↪ Running on the cluster in Dev mode
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ $ odo init
__
/ \__ Initializing a new component
\__/ \ Files: Source code detected, a Devfile will be determined based upon source code autodetection
/ \__/ odo version: v3.10.0
/ \__/ odo version: v3.11.0
\__/

Interactive mode enabled, please answer the following questions:
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ $ odo dev
__
/ \__ Developing using the "my-go-app" Devfile
\__/ \ Namespace: odo-dev
/ \__/ odo version: v3.10.0
/ \__/ odo version: v3.11.0
\__/

↪ Running on the cluster in Dev mode
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ $ odo init
__
/ \__ Initializing a new component
\__/ \ Files: Source code detected, a Devfile will be determined based upon source code autodetection
/ \__/ odo version: v3.10.0
/ \__/ odo version: v3.11.0
\__/

Interactive mode enabled, please answer the following questions:
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ $ odo dev
__
/ \__ Developing using the "my-java-app" Devfile
\__/ \ Namespace: odo-dev
/ \__/ odo version: v3.10.0
/ \__/ odo version: v3.11.0
\__/

↪ Running on the cluster in Dev mode
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ $ odo init
__
/ \__ Initializing a new component
\__/ \ Files: Source code detected, a Devfile will be determined based upon source code autodetection
/ \__/ odo version: v3.10.0
/ \__/ odo version: v3.11.0
\__/

Interactive mode enabled, please answer the following questions:
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ $ odo dev
__
/ \__ Developing using the "my-nodejs-app" Devfile
\__/ \ Namespace: odo-dev
/ \__/ odo version: v3.10.0
/ \__/ odo version: v3.11.0
\__/

↪ Running on the cluster in Dev mode
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ $ odo init
__
/ \__ Initializing a new component
\__/ \ Files: Source code detected, a Devfile will be determined based upon source code autodetection
/ \__/ odo version: v3.10.0
/ \__/ odo version: v3.11.0
\__/

Interactive mode enabled, please answer the following questions:
2 changes: 1 addition & 1 deletion pkg/version/version.go
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ Changing these values will change the versioning information when releasing odo.

var (
// VERSION is version number that will be displayed when running ./odo version
VERSION = "v3.10.0"
VERSION = "v3.11.0"

// GITCOMMIT is hash of the commit that will be displayed when running ./odo version
// this will be overwritten when running build like this: go build -ldflags="-X github.com/redhat-developer/odo/cmd.GITCOMMIT=$(GITCOMMIT)"
2 changes: 1 addition & 1 deletion scripts/rpm-prepare.sh
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ set +ex
echo "Reading ODO_VERSION, ODO_RELEASE and GIT_COMMIT env, if they are set"
# Change version as needed. In most cases ODO_RELEASE would not be touched unless
# we want to do a re-lease of same version as we are not backport
export ODO_VERSION=${ODO_VERSION:=3.10.0}
export ODO_VERSION=${ODO_VERSION:=3.11.0}
export ODO_RELEASE=${ODO_RELEASE:=1}

export GIT_COMMIT=${GIT_COMMIT:=$(git rev-parse --short HEAD 2>/dev/null)}

0 comments on commit 339c51b

Please sign in to comment.