Skip to content

Commit 6ccdcc2

Browse files
authored
fix gh binaries (#197)
* fix gh binaries
1 parent 96d8dcc commit 6ccdcc2

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
changelog:
2+
- type: NON_USER_FACING
3+
description: fix CI scripts.

tools/wasme/cli/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ endif
181181
# Important to clean before pushing new releases. Dockerfiles and binaries may not update properly
182182
.PHONY: clean
183183
clean:
184-
rm -rf _output/
185-
rm -rf example/cpp/{bazel-bin,bazel-out,bazel-testlogs,bazel-workspace}
184+
rm -rf _output/
185+
rm -rf example/cpp/{bazel-bin,bazel-out,bazel-testlogs,bazel-workspace}
186186

187187
.PHONY: build-example
188188
build-example:

tools/wasme/cli/ci/upload_github_release_assets.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
const buildDir = "_output"
88
const installDir = "operator/install"
99
const repoOwner = "solo-io"
10-
const repoName = "wasme"
10+
const repoName = "wasm"
1111

1212
func main() {
1313
assets := []githubutils.ReleaseAssetSpec{

tools/wasme/cli/docs/Makefile

+10-3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ IMAGE_REPO := $(GCR_REPO_PREFIX)/$(IMAGE_LEAF_NAME)
2121
PRODUCT_SCOPE := web-assembly-hub
2222
DOCS_VERSION := latest
2323

24+
25+
ifdef WASME_USE_PODMAN
26+
CONTAINERCLI := podman
27+
else
28+
CONTAINERCLI := docker
29+
endif
30+
2431
#----------------------------------------------------------------------------------
2532
# Docs
2633
#----------------------------------------------------------------------------------
@@ -79,10 +86,10 @@ SERVE_AS_LATEST_TAG:=$(VERSION)-latest
7986
## don't bother generating manifest, just copy/modify from docs-prod repo
8087
# docker-push-docs: site-release manifest
8188
docker-push-docs: site-release
82-
@echo "${GCR_PASSWORD}" | docker login -u ${GCR_USERNAME} --password-stdin gcr.io
83-
docker build \
89+
@echo "${GCR_PASSWORD}" | $(CONTAINERCLI) login -u ${GCR_USERNAME} --password-stdin gcr.io
90+
$(CONTAINERCLI) build \
8491
--build-arg VERSION=latest \
8592
--build-arg PRODUCT_SCOPE=$(PRODUCT_SCOPE) \
8693
--build-arg FROM_DIR=./site-latest \
8794
-t $(GCR_REPO_PREFIX)/$(IMAGE_LEAF_NAME):$(SERVE_AS_LATEST_TAG) .
88-
docker push $(GCR_REPO_PREFIX)/$(IMAGE_LEAF_NAME):$(SERVE_AS_LATEST_TAG)
95+
$(CONTAINERCLI) push $(GCR_REPO_PREFIX)/$(IMAGE_LEAF_NAME):$(SERVE_AS_LATEST_TAG)

0 commit comments

Comments
 (0)