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

Jump to bottom

fix gh binaries #197

Merged
merged 1 commit into from
Oct 12, 2020
Merged

fix gh binaries #197

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
3 changes: 3 additions & 0 deletions tools/wasme/changelog/v0.0.27.1/fixscripts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
changelog:
- type: NON_USER_FACING
description: fix CI scripts.
4 changes: 2 additions & 2 deletions tools/wasme/cli/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ endif
# Important to clean before pushing new releases. Dockerfiles and binaries may not update properly
.PHONY: clean
clean:
rm -rf _output/
rm -rf example/cpp/{bazel-bin,bazel-out,bazel-testlogs,bazel-workspace}
rm -rf _output/
rm -rf example/cpp/{bazel-bin,bazel-out,bazel-testlogs,bazel-workspace}

.PHONY: build-example
build-example:
Expand Down
2 changes: 1 addition & 1 deletion tools/wasme/cli/ci/upload_github_release_assets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
const buildDir = "_output"
const installDir = "operator/install"
const repoOwner = "solo-io"
const repoName = "wasme"
const repoName = "wasm"

func main() {
assets := []githubutils.ReleaseAssetSpec{
Expand Down
13 changes: 10 additions & 3 deletions tools/wasme/cli/docs/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ IMAGE_REPO := $(GCR_REPO_PREFIX)/$(IMAGE_LEAF_NAME)
PRODUCT_SCOPE := web-assembly-hub
DOCS_VERSION := latest


ifdef WASME_USE_PODMAN
CONTAINERCLI := podman
else
CONTAINERCLI := docker
endif

#----------------------------------------------------------------------------------
# Docs
#----------------------------------------------------------------------------------
Expand Down Expand Up @@ -79,10 +86,10 @@ SERVE_AS_LATEST_TAG:=$(VERSION)-latest
## don't bother generating manifest, just copy/modify from docs-prod repo
# docker-push-docs: site-release manifest
docker-push-docs: site-release
@echo "${GCR_PASSWORD}" | docker login -u ${GCR_USERNAME} --password-stdin gcr.io
docker build \
@echo "${GCR_PASSWORD}" | $(CONTAINERCLI) login -u ${GCR_USERNAME} --password-stdin gcr.io
$(CONTAINERCLI) build \
--build-arg VERSION=latest \
--build-arg PRODUCT_SCOPE=$(PRODUCT_SCOPE) \
--build-arg FROM_DIR=./site-latest \
-t $(GCR_REPO_PREFIX)/$(IMAGE_LEAF_NAME):$(SERVE_AS_LATEST_TAG) .
docker push $(GCR_REPO_PREFIX)/$(IMAGE_LEAF_NAME):$(SERVE_AS_LATEST_TAG)
$(CONTAINERCLI) push $(GCR_REPO_PREFIX)/$(IMAGE_LEAF_NAME):$(SERVE_AS_LATEST_TAG)