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

Further build refinements, use ain-builder, rust 1.70 #2054

Merged
merged 26 commits into from
Jun 13, 2023
Merged

Further build refinements, use ain-builder, rust 1.70 #2054

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ff89e58
Switch builder to ain-builder, rust to 1.70
prasannavl Jun 12, 2023
11180cc
Cleanup workfflow, enable more release builds
prasannavl Jun 12, 2023
ede3756
Fix tests, use apt-get in automation
prasannavl Jun 12, 2023
320e9d5
Add PATH export to ci-vars
prasannavl Jun 13, 2023
505f592
Use ci-vars, cleanup
prasannavl Jun 13, 2023
3074263
Remove repeated export
prasannavl Jun 13, 2023
b998189
Just install native deps
prasannavl Jun 13, 2023
43c8c3d
Update sync tests to the latest workflow
prasannavl Jun 13, 2023
3e24dc8
Fix docker arg naming
sieniven Jun 13, 2023
b0e5aa9
Fix dockerfiles
sieniven Jun 13, 2023
1d12ba5
Build arg fixes
prasannavl Jun 13, 2023
24ceeff
Merge branch 'master' into pvl/ain-builder
prasannavl Jun 13, 2023
b7877d5
Fix tests-e2e workflow to export ci var, add debug logs
sieniven Jun 13, 2023
b842d77
Merge branch 'pvl/ain-builder' of github.com:DeFiCh/ain into pvl/ain-…
sieniven Jun 13, 2023
451e6fc
Add debug log
sieniven Jun 13, 2023
1d1e31e
Debug logs
sieniven Jun 13, 2023
7a18fc5
Fix debug log
sieniven Jun 13, 2023
d097834
Debug ci
sieniven Jun 13, 2023
fed16ed
sudo permissons
sieniven Jun 13, 2023
7948050
Change cargo dir to root
sieniven Jun 13, 2023
c98a904
Run set up separately
sieniven Jun 13, 2023
69a8c88
Fix rustup command not found bug
sieniven Jun 13, 2023
8a8185c
Fix test-sync
sieniven Jun 13, 2023
1e75088
Remove sudo privileges
sieniven Jun 13, 2023
2db3324
Refactor setup target dependency
sieniven Jun 13, 2023
47e07c4
Add comments, minor changes
prasannavl Jun 13, 2023
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
4 changes: 2 additions & 2 deletions contrib/dockerfiles/aarch64-linux-gnu.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG TARGET=aarch64-linux-gnu
# https://github.com/DeFiCh/containers/blob/main/ain-builder/Dockerfile
FROM --platform=linux/amd64 docker.io/defi/ain-builder as builder
ARG TARGET
ARG DEBUG
ARG MAKE_DEBUG
LABEL org.defichain.name="defichain-builder"
LABEL org.defichain.arch=${TARGET}

Expand All @@ -17,7 +17,7 @@ RUN ./make.sh ci-setup-deps-target

COPY . .
RUN ./make.sh build-deps
RUN MAKE_DEBUG=${DEBUG} ./make.sh build-conf
RUN MAKE_DEBUG=${MAKE_DEBUG} ./make.sh build-conf
sieniven marked this conversation as resolved.
Show resolved Hide resolved
RUN ./make.sh build-make

RUN mkdir /app && cd build/ && \
Expand Down
4 changes: 2 additions & 2 deletions contrib/dockerfiles/arm-linux-gnueabihf.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG TARGET=arm-linux-gnueabihf
# https://github.com/DeFiCh/containers/blob/main/ain-builder/Dockerfile
FROM --platform=linux/amd64 docker.io/defi/ain-builder as builder
ARG TARGET
ARG DEBUG
ARG MAKE_DEBUG
LABEL org.defichain.name="defichain-builder"
LABEL org.defichain.arch=${TARGET}

Expand All @@ -17,7 +17,7 @@ RUN ./make.sh ci-setup-deps-target

COPY . .
RUN ./make.sh build-deps
RUN MAKE_DEBUG=${DEBUG} ./make.sh build-conf
RUN MAKE_DEBUG=${MAKE_DEBUG} ./make.sh build-conf
RUN ./make.sh build-make

RUN mkdir /app && cd build/ && \
Expand Down
4 changes: 2 additions & 2 deletions contrib/dockerfiles/noarch.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG TARGET=unknown
# -----------
FROM ubuntu:latest as builder
ARG TARGET
ARG DEBUG
ARG MAKE_DEBUG
LABEL org.defichain.name="defichain-builder"
LABEL org.defichain.arch=${TARGET}

Expand All @@ -19,7 +19,7 @@ RUN ./make.sh ci-setup-deps-target

COPY . .
RUN ./make.sh build-deps
RUN MAKE_DEBUG=${DEBUG} ./make.sh build-conf
RUN MAKE_DEBUG=${MAKE_DEBUG} ./make.sh build-conf
RUN ./make.sh build-make

RUN mkdir /app && cd build/ && \
Expand Down
4 changes: 2 additions & 2 deletions contrib/dockerfiles/x86_64-pc-linux-gnu.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG TARGET=x86_64-pc-linux-gnu
# https://github.com/DeFiCh/containers/blob/main/ain-builder/Dockerfile
FROM --platform=linux/amd64 docker.io/defi/ain-builder as builder
ARG TARGET
ARG DEBUG
ARG MAKE_DEBUG
LABEL org.defichain.name="defichain-builder"
LABEL org.defichain.arch=${TARGET}

Expand All @@ -17,7 +17,7 @@ RUN ./make.sh ci-setup-deps-target

COPY . .
RUN ./make.sh build-deps
RUN MAKE_DEBUG=${DEBUG} ./make.sh build-conf
RUN MAKE_DEBUG=${MAKE_DEBUG} ./make.sh build-conf
RUN ./make.sh build-make

RUN mkdir /app && cd build/ && \
Expand Down
2 changes: 1 addition & 1 deletion make.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ docker_build() {
local img="${img_prefix}-${target}:${img_version}"
echo "> building: ${img}"
echo "> docker build: ${img}"
docker build -f "${docker_file}" --build-arg TARGET="${target}" --build-arg DEBUG="${MAKE_DEBUG}" -t "${img}" "${docker_context}"
docker build -f "${docker_file}" --build-arg TARGET="${target}" --build-arg MAKE_DEBUG="${MAKE_DEBUG}" -t "${img}" "${docker_context}"
}

docker_deploy() {
Expand Down