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

fix(ci): use released action version #4500

Merged
merged 1 commit into from
Jun 22, 2023
Merged

fix(ci): use released action version #4500

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
2 changes: 2 additions & 0 deletions .github/actions/kamel-build-binary/build-binary.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ fi
echo "Moving kamel binary to be visible on PATH"

if [ "$RUNNER_OS" == "macOS" ]; then
# We need to build the binary for the proper platform if we're not on Linux
make build
${SUDO} mv $(readlink kamel) /usr/local/bin/kamel
else
${SUDO} mv $(readlink kamel) /usr/bin/kamel
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/kamel-config-cluster-kind/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ runs:
steps:
- id: install-cluster
name: Install Cluster
uses: container-tools/kind-action@61f1afd4807b0dac84f3232ec99e45c63701d220
uses: container-tools/kind-action@v2.0.1
if: ${{ env.CLUSTER_KIND_CONFIGURED != 'true' }}
with:
version: v0.14.0
Expand Down
14 changes: 11 additions & 3 deletions script/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,8 @@ test-quarkus-native-high-memory: do-build
go test -timeout 180m -v ./e2e/native -tags=integration,high_memory $(TEST_QUARKUS_RUN) $(GOTESTFMT)

build-kamel:
@echo "####### Building kamel CLI for $(IMAGE_ARCH) architecture..."
CGO_ENABLED=0 GOOS=linux GOARCH=$(IMAGE_ARCH) go build $(GOFLAGS) -o build/_output/bin/kamel-$(IMAGE_ARCH) ./cmd/kamel/*.go
@echo "####### Building kamel CLI for $(GOOS) $(IMAGE_ARCH) architecture..."
CGO_ENABLED=0 GOARCH=$(IMAGE_ARCH) go build $(GOFLAGS) -o build/_output/bin/kamel-$(IMAGE_ARCH) ./cmd/kamel/*.go
# Symbolic link to a local CLI
ln -sf build/_output/bin/kamel-$(IMAGE_ARCH) ./kamel

Expand Down Expand Up @@ -422,9 +422,17 @@ maven-overlay:
./script/maven_overlay.sh -s "$(STAGING_RUNTIME_REPO)" -d "$(CAMEL_K_RUNTIME_DIR)" $(RUNTIME_VERSION) build/_maven_overlay

kamel-overlay:
@echo "####### Copy arch $(IMAGE_ARCH) CLI into output build directory..."
mkdir -p build/_output/bin
ifeq ($(shell uname -s 2>/dev/null || echo Unknown),Linux)
@echo "####### Copying Linux platform arch $(IMAGE_ARCH) CLI into output build directory..."
else
@echo "####### (Re)Building a Linux platform arch $(IMAGE_ARCH) CLI "
@echo "####### Likely you're on a non Linux host, so I need to build a Linux CLI to bundle in the container image"
GOOS=linux GOARCH=$(IMAGE_ARCH) go build $(GOFLAGS) -o build/_output/bin/kamel-$(IMAGE_ARCH) ./cmd/kamel/*.go
endif
cp build/_output/bin/kamel-$(IMAGE_ARCH) build/_output/bin/kamel


images: build kamel-overlay maven-overlay bundle-kamelets
ifneq (,$(findstring SNAPSHOT,$(RUNTIME_VERSION)))
./script/package_maven_artifacts.sh -s "$(STAGING_RUNTIME_REPO)" -d "$(CAMEL_K_RUNTIME_DIR)" $(RUNTIME_VERSION)
Expand Down