Skip to content

Commit e3c334c

Browse files
committed
build: CI is handled by GitHub now, so we don't need to compile local versions
Jira: IAM-1908
1 parent 7851964 commit e3c334c

3 files changed

Lines changed: 1 addition & 40 deletions

File tree

buildspec.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ phases:
2121
- echo $DOCKERHUB_PASSWORD | docker login -u $DOCKERHUB_USERNAME --password-stdin
2222
build:
2323
commands:
24-
- if [ "$PR" = 1 ]; then ./do.sh package_local; fi
25-
- if [ "$MASTER" = 1 ]; then ./do.sh package_local && ./do.sh push_image; fi
24+
- if [ "$MASTER" = 1 ]; then ./do.sh docker_build && ./do.sh push_image; fi
2625
post_build:
2726
commands:
2827
- echo "Environment is ${DEPLOY_ENV}"

ci/install_deps.sh

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,4 @@
1-
export RUSTUP_HOME=/usr/local/rustup
2-
export CARGO_HOME=/usr/local/cargo
3-
export PATH=/usr/local/cargo/bin:$PATH
4-
export RUST_VERSION=1.60.0
51
export DESIRED_VERSION="v3.5.4"
6-
72
set -eux
8-
dpkgArch="$(dpkg --print-architecture)"
9-
case "${dpkgArch##*-}" in
10-
amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='49c96f3f74be82f4752b8bffcf81961dea5e6e94ce1ccba94435f12e871c3bdb' ;;
11-
armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='5a2be2919319e8778698fa9998002d1ec720efe7cb4f6ee4affb006b5e73f1be' ;;
12-
arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='d93ef6f91dab8299f46eef26a56c2d97c66271cea60bf004f2f088a86a697078' ;;
13-
i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='e3d0ae3cfce5c6941f74fed61ca83e53d4cd2deb431b906cbd0687f246efede4' ;;
14-
*) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;;
15-
esac;
16-
url="https://static.rust-lang.org/rustup/archive/1.22.1/${rustArch}/rustup-init";
17-
wget --no-verbose "$url"
18-
echo "${rustupSha256} *rustup-init" | sha256sum -c -
19-
chmod +x rustup-init
20-
./rustup-init -y --no-modify-path --default-toolchain $RUST_VERSION
21-
rm rustup-init
22-
chmod -R a+w $RUSTUP_HOME $CARGO_HOME
23-
rustup --version
24-
cargo --version
25-
rustc --version
26-
27-
rustup target add x86_64-unknown-linux-gnu
283
HELM_INSTALL_DIR=/bin
294
curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash

do.sh

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,10 @@ NAME=dino-park-packs
66
DOCKER_REGISTRY=320464205386.dkr.ecr.us-west-2.amazonaws.com
77
REV=${REV:-latest}
88

9-
compile_release() {
10-
cargo build --release
11-
}
12-
13-
docker_build_local() {
14-
docker build -t ${DOCKER_REGISTRY}/${NAME}:${REV} -f Dockerfile.local .
15-
}
16-
179
docker_build() {
1810
docker build -t ${DOCKER_REGISTRY}/${NAME}:${REV} -f Dockerfile .
1911
}
2012

21-
package_local() {
22-
compile_release
23-
docker_build_local
24-
}
25-
2613
push_image() {
2714
docker push ${DOCKER_REGISTRY}/${NAME}:${REV}
2815
}

0 commit comments

Comments
 (0)