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

revert golang1.16 arm32 changes #3615

Merged
merged 3 commits into from
Feb 11, 2022
Merged

revert golang1.16 arm32 changes #3615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1736512
revert golang1.16 arm32 changes
algobarb Feb 11, 2022
7b77e8d
revert stash commented out for local testing
algobarb Feb 11, 2022
22c99e4
Merge branch 'rel/beta' into relbeta3.4.0
algojohnlee Feb 11, 2022
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
5 changes: 2 additions & 3 deletions docker/build/cicd.ubuntu.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ ARG ARCH="amd64"
FROM ${ARCH}/ubuntu:18.04
ARG GOLANG_VERSION
ARG ARCH="amd64"
ARG GOARCH="amd64"
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install -y build-essential git libboost-all-dev wget sqlite3 autoconf jq bsdmainutils shellcheck awscli
WORKDIR /root
RUN wget https://dl.google.com/go/go${GOLANG_VERSION}.linux-${GOARCH}.tar.gz \
&& tar -xvf go${GOLANG_VERSION}.linux-${GOARCH}.tar.gz && \
RUN wget https://dl.google.com/go/go${GOLANG_VERSION}.linux-${ARCH%v*}.tar.gz \
&& tar -xvf go${GOLANG_VERSION}.linux-${ARCH%v*}.tar.gz && \
mv go /usr/local
ENV GOROOT=/usr/local/go \
GOPATH=$HOME/go \
Expand Down
13 changes: 5 additions & 8 deletions test/muleCI/mule.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ agents:
buildArgs:
- GOLANG_VERSION=`./scripts/get_golang_version.sh`
- ARCH=amd64
- GOARCH=amd64
- name: cicd.centos.amd64
dockerFilePath: docker/build/cicd.centos.Dockerfile
image: algorand/go-algorand-ci-linux-centos
Expand Down Expand Up @@ -42,12 +41,11 @@ agents:
buildArgs:
- GOLANG_VERSION=`./scripts/get_golang_version.sh`
- ARCH=arm64v8
- GOARCH=arm64
- name: cicd.ubuntu.arm
dockerFilePath: docker/build/cicd.ubuntu.Dockerfile
- name: cicd.alpine.arm
dockerFilePath: docker/build/cicd.alpine.Dockerfile
image: algorand/go-algorand-ci-linux
version: scripts/configure_dev-deps.sh
arch: arm32v7
arch: arm32v6
env:
- TRAVIS_BRANCH=${GIT_BRANCH}
- NETWORK=$NETWORK
Expand All @@ -56,8 +54,7 @@ agents:
- GOHOSTARCH=arm
buildArgs:
- GOLANG_VERSION=`./scripts/get_golang_version.sh`
- ARCH=arm32v7
- GOARCH=armv6l
- ARCH=arm32v6
- name: docker-ubuntu
dockerFilePath: docker/build/docker.ubuntu.Dockerfile
image: algorand/go-algorand-docker-linux-ubuntu
Expand Down Expand Up @@ -99,7 +96,7 @@ tasks:
target: ci-build
- task: docker.Make
name: build.arm
agent: cicd.ubuntu.arm
agent: cicd.alpine.arm
target: ci-build

- task: docker.Make
Expand Down