Skip to content

Commit c0d00cb

Browse files
committed
Merge remote-tracking branch 'origin/main' into juno-11-rc
2 parents 61a8241 + 97a626c commit c0d00cb

File tree

3 files changed

+36
-6
lines changed

3 files changed

+36
-6
lines changed

.github/workflows/superlinter.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Lint Code Base
2+
3+
on:
4+
push:
5+
branches: [ "main" ]
6+
pull_request:
7+
branches: [ "main" ]
8+
jobs:
9+
run-lint:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout code
13+
uses: actions/checkout@v3
14+
with:
15+
# Full git history is needed to get a proper list of changed files within `super-linter`
16+
fetch-depth: 0
17+
18+
- name: Lint Code Base
19+
uses: github/super-linter@v4
20+
env:
21+
VALIDATE_ALL_CODEBASE: false
22+
DEFAULT_BRANCH: "main"
23+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
# docker build . -t cosmoscontracts/juno:latest
22
# docker run --rm -it cosmoscontracts/juno:latest /bin/sh
3-
FROM golang:1.19-alpine3.15 AS go-builder
3+
FROM golang:1.18-alpine3.15 AS go-builder
44

55
# this comes from standard alpine nightly file
66
# https://github.com/rust-lang/docker-rust-nightly/blob/master/alpine3.12/Dockerfile
77
# with some changes to support our toolchain, etc
8+
SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
9+
# we probably want to default to latest and error
10+
# since this is predominantly for dev use
11+
# hadolint ignore=DL3018
812
RUN set -eux; apk add --no-cache ca-certificates build-base;
913

14+
# hadolint ignore=DL3018
1015
RUN apk add git
1116
# NOTE: add these to run with LEDGER_ENABLED=true
1217
# RUN apk add libusb-dev linux-headers
@@ -21,12 +26,14 @@ RUN sha256sum /lib/libwasmvm_muslc.aarch64.a | grep 7d2239e9f25e96d0d4daba982ce9
2126
RUN sha256sum /lib/libwasmvm_muslc.x86_64.a | grep f6282df732a13dec836cda1f399dd874b1e3163504dbd9607c6af915b2740479
2227

2328
# Copy the library you want to the final location that will be found by the linker flag `-lwasmvm_muslc`
24-
RUN cp /lib/libwasmvm_muslc.$(uname -m).a /lib/libwasmvm_muslc.a
29+
RUN cp "/lib/libwasmvm_muslc.$(uname -m).a" /lib/libwasmvm_muslc.a
2530

2631
# force it to use static lib (from above) not standard libgo_cosmwasm.so file
27-
RUN LEDGER_ENABLED=false BUILD_TAGS=muslc LINK_STATICALLY=true make build
28-
RUN file /code/bin/junod
29-
RUN echo "Ensuring binary is statically linked ..." \
32+
# then log output of file /code/bin/junod
33+
# then ensure static linking
34+
RUN LEDGER_ENABLED=false BUILD_TAGS=muslc LINK_STATICALLY=true make build \
35+
&& file /code/bin/junod \
36+
&& echo "Ensuring binary is statically linked ..." \
3037
&& (file /code/bin/junod | grep "statically linked")
3138

3239
# --------------------------------------------------------

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/CosmosContracts/juno/v10
22

3-
go 1.19
3+
go 1.18
44

55
require (
66
github.com/CosmWasm/wasmd v0.28.1-0.20220825115153-261812986e9a

0 commit comments

Comments
 (0)