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.

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

chore: remove private repo dependencies #43

Merged
merged 1 commit into from
Jul 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 2 deletions .cargo/config.toml

This file was deleted.

12 changes: 2 additions & 10 deletions .github/workflows/builds_and_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ jobs:
libwasmvm_sanity:
runs-on: ubuntu-latest
steps:
- name: Install Git
run: sudo apt install -y git
- name: Git config
run: git config --global url."https://${{ secrets.ACCESS_TOKEN }}:[email protected]/".insteadOf "https://github.com/"
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
Expand Down Expand Up @@ -58,7 +54,7 @@ jobs:
- name: Check Go formatting
run: |
[ "$(gofmt -l .)" = "" ] || (gofmt -d . && exit 1)

format-scripts:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -87,10 +83,6 @@ jobs:
build_shared_library:
runs-on: ubuntu-latest
steps:
- name: Install Git
run: sudo apt install -y git
- name: Git config
run: git config --global url."https://${{ secrets.ACCESS_TOKEN }}:[email protected]/".insteadOf "https://github.com/"
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
Expand Down Expand Up @@ -135,7 +127,7 @@ jobs:
name: libwasmvm
path: /tmp/builds
- name: Copy libwasmvm
run: cp /tmp/builds/libwasmvm.so ./api
run: cp /tmp/builds/libwasmvm.so ./api
- name: Go integration tests
run: make test
- name: Go tests with cgo and race condition safety checks
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,20 @@ test-safety:
release-build-alpine:
rm -rf target/release
# build the muslc *.a file
docker run --rm -v $(shell pwd):/code -e GITHUB_TOKEN=${GITHUB_TOKEN} $(BUILDERS_PREFIX)-alpine
docker run --rm -v $(shell pwd):/code $(BUILDERS_PREFIX)-alpine
# try running go tests using this lib with muslc
docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd):/code -w /code $(BUILDERS_PREFIX)-alpine go build -tags muslc .
docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd):/code -w /code $(BUILDERS_PREFIX)-alpine go build -tags muslc .
docker run --rm -u $(USER_ID):$(USER_GROUP) -v $(shell pwd):/code -w /code $(BUILDERS_PREFIX)-alpine go test -tags='muslc mocks' ./api ./types

# Creates a release build in a containerized build environment of the shared library for glibc Linux (.so)
release-build-linux:
rm -rf target/release
docker run --rm -v $(shell pwd):/code -e GITHUB_TOKEN=${GITHUB_TOKEN} $(BUILDERS_PREFIX)-centos7
docker run --rm -v $(shell pwd):/code $(BUILDERS_PREFIX)-centos7

# Creates a release build in a containerized build environment of the shared library for macOS (.dylib)
release-build-macos:
rm -rf target/release
docker run --rm -v $(shell pwd):/code -e GITHUB_TOKEN=${GITHUB_TOKEN} $(BUILDERS_PREFIX)-cross
docker run --rm -v $(shell pwd):/code $(BUILDERS_PREFIX)-cross

release-build:
# Write like this because those must not run in parallal
Expand Down
2 changes: 1 addition & 1 deletion builders/Dockerfile.alpine
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
# https://github.com/rust-lang/docker-rust-nightly/blob/master/alpine3.12/Dockerfile
# with some changes to support our toolchain, etc
RUN set -eux; \
apk add --no-cache git \
apk add --no-cache \
ca-certificates \
build-base;

Expand Down
2 changes: 1 addition & 1 deletion builders/Dockerfile.centos7
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM centos:centos7

RUN yum -y update
RUN yum -y install clang gcc gcc-c++ make wget git
RUN yum -y install clang gcc gcc-c++ make wget

# GET FROM https://github.com/rust-lang/docker-rust-nightly
ENV RUSTUP_HOME=/usr/local/rustup \
Expand Down
2 changes: 1 addition & 1 deletion builders/Dockerfile.cross
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM rust:1.51.0-buster

# Install build dependencies
RUN apt-get update
RUN apt install -y clang gcc g++ zlib1g-dev libmpc-dev libmpfr-dev libgmp-dev git
RUN apt install -y clang gcc g++ zlib1g-dev libmpc-dev libmpfr-dev libgmp-dev
RUN apt install -y build-essential cmake

# add some llvm configs for later - how to cross-compile this in wasmer-llvm-backend???
Expand Down
1 change: 0 additions & 1 deletion builders/guest/build_linux.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/bin/bash

git config --global url."https://${GITHUB_TOKEN}:[email protected]/".insteadOf "https://github.com/"
cargo build --release
cp target/release/deps/libwasmvm.so api
# FIXME: re-enable stripped so when we approach a production release, symbols are nice for debugging
Expand Down
1 change: 0 additions & 1 deletion builders/guest/build_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ export LIBZ_SYS_STATIC=1
export CC=o64-clang
export CXX=o64-clang++

git config --global url."https://${GITHUB_TOKEN}:[email protected]/".insteadOf "https://github.com/"
cargo build --release --target x86_64-apple-darwin
cp target/x86_64-apple-darwin/release/deps/libwasmvm.dylib api
1 change: 0 additions & 1 deletion builders/guest/build_muslc.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/bin/sh

git config --global url."https://${GITHUB_TOKEN}:[email protected]/".insteadOf "https://github.com/"
cargo build --release --example muslc
cp /code/target/release/examples/libmuslc.a /code/api/libwasmvm_muslc.a