diff --git a/.circleci/config.yml b/.circleci/config.yml index 31c3c7dab..da961f99a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: orangepi-plus2: docker: - image: circleci/golang:1.12 - working_directory: $GOPATH/src/github.com/skycoin/libskycoin + working_directory: $GOPATH/src/github.com/fibercrypto/libskycoin environment: QEMU_PLATFORM: orangepi-plus2 @@ -13,12 +13,12 @@ jobs: - setup_remote_docker: version: 18.06.0-ce docker_layer_caching: true - - run: docker build --build-arg QEMU_PLATFORM --build-arg QEMU_OS=debian --file $GOPATH/src/github.com/skycoin/libskycoin/docker/images/test-arm/Dockerfile $GOPATH/src/github.com/skycoin/libskycoin -t skydev-test + - run: docker build --build-arg QEMU_PLATFORM --build-arg QEMU_OS=debian --file $GOPATH/src/github.com/fibercrypto/libskycoin/docker/images/test-arm/Dockerfile $GOPATH/src/github.com/fibercrypto/libskycoin -t skydev-test raspberrypi3: docker: - image: circleci/golang:1.12 - working_directory: $GOPATH/src/github.com/skycoin/libskycoin + working_directory: $GOPATH/src/github.com/fibercrypto/libskycoin environment: QEMU_PLATFORM: raspberrypi3 @@ -28,12 +28,12 @@ jobs: - setup_remote_docker: version: 18.06.0-ce docker_layer_caching: true - - run: docker build --build-arg QEMU_PLATFORM --build-arg QEMU_OS=debian --file $GOPATH/src/github.com/skycoin/libskycoin/docker/images/test-arm/Dockerfile $GOPATH/src/github.com/skycoin/libskycoin -t skydev-test + - run: docker build --build-arg QEMU_PLATFORM --build-arg QEMU_OS=debian --file $GOPATH/src/github.com/fibercrypto/libskycoin/docker/images/test-arm/Dockerfile $GOPATH/src/github.com/fibercrypto/libskycoin -t skydev-test raspberrypi2: docker: - image: circleci/golang:1.12 - working_directory: $GOPATH/src/github.com/skycoin/libskycoin + working_directory: $GOPATH/src/github.com/fibercrypto/libskycoin environment: QEMU_PLATFORM: raspberry-pi2 @@ -43,12 +43,12 @@ jobs: - setup_remote_docker: version: 18.06.0-ce docker_layer_caching: true - - run: docker build --build-arg QEMU_PLATFORM --build-arg QEMU_OS=debian --file $GOPATH/src/github.com/skycoin/libskycoin/docker/images/test-arm/Dockerfile $GOPATH/src/github.com/skycoin/libskycoin -t skydev-test + - run: docker build --build-arg QEMU_PLATFORM --build-arg QEMU_OS=debian --file $GOPATH/src/github.com/fibercrypto/libskycoin/docker/images/test-arm/Dockerfile $GOPATH/src/github.com/fibercrypto/libskycoin -t skydev-test bananapi_m1_plus: docker: - image: circleci/golang:1.12 - working_directory: $GOPATH/src/github.com/skycoin/libskycoin + working_directory: $GOPATH/src/github.com/fibercrypto/libskycoin environment: QEMU_PLATFORM: bananapi-m1-plus @@ -58,19 +58,35 @@ jobs: - setup_remote_docker: version: 18.06.0-ce docker_layer_caching: true - - run: docker build --build-arg QEMU_PLATFORM --build-arg QEMU_OS=debian --file $GOPATH/src/github.com/skycoin/libskycoin/docker/images/test-arm/Dockerfile $GOPATH/src/github.com/skycoin/libskycoin -t skydev-test + - run: docker build --build-arg QEMU_PLATFORM --build-arg QEMU_OS=debian --file $GOPATH/src/github.com/fibercrypto/libskycoin/docker/images/test-arm/Dockerfile $GOPATH/src/github.com/fibercrypto/libskycoin -t skydev-test - publish-github-release_32: + deploy_arm_armv7: docker: - image: circleci/golang:1.12 - working_directory: $GOPATH/src/github.com/skycoin/libskycoin + working_directory: $GOPATH/src/github.com/fibercrypto/libskycoin + environment: + QEMU_PLATFORM: armv7hf + steps: + - run: mkdir -p $GOPATH/src/github.com/ $GOPATH/src/github.com/skycoin + - checkout + - setup_remote_docker: + version: 18.06.0-ce + docker_layer_caching: true + - run: cd $GOPATH/src/github.com/fibercrypto/libskycoin/ci-scripts && bash deploy-arm.sh + + deploy_arm_armv8: + docker: + - image: circleci/golang:1.12 + working_directory: $GOPATH/src/github.com/fibercrypto/libskycoin + environment: + QEMU_PLATFORM: aarch64 steps: - run: mkdir -p $GOPATH/src/github.com/ $GOPATH/src/github.com/skycoin - checkout - setup_remote_docker: version: 18.06.0-ce docker_layer_caching: true - - run: cd $GOPATH/src/github.com/skycoin/libskycoin/ci-scripts && bash deploy-arm.sh + - run: cd $GOPATH/src/github.com/fibercrypto/libskycoin/ci-scripts && bash deploy-arm.sh workflows: version: 2 @@ -80,4 +96,16 @@ workflows: - orangepi-plus2 - raspberrypi2 - bananapi_m1_plus - - publish-github-release_32 + - hold: + type: approval + requires: + - raspberrypi3 + - orangepi-plus2 + - raspberrypi2 + - bananapi_m1_plus + - deploy_arm_armv7: + requires: + - hold + - deploy_arm_armv8: + requires: + - hold diff --git a/ci-scripts/build.sh b/ci-scripts/build.sh index 2ad83cf0a..fa61112e0 100644 --- a/ci-scripts/build.sh +++ b/ci-scripts/build.sh @@ -1,2 +1,2 @@ echo "Init" -make -C $GOPATH/src/github.com/skycoin/libskycoin build-libc \ No newline at end of file +make -C $GOPATH/src/github.com/fibercrypto/libskycoin build-libc \ No newline at end of file diff --git a/ci-scripts/deploy-arm.sh b/ci-scripts/deploy-arm.sh index 40d9e74a3..ee052e81a 100644 --- a/ci-scripts/deploy-arm.sh +++ b/ci-scripts/deploy-arm.sh @@ -6,7 +6,8 @@ git --version export VERSION="$(git describe --tags --exact-match HEAD)" +echo $QEMU_PLATFORM + if [[ "$VERSION" ]]; then - docker build --build-arg SHA1=$CIRCLE_SHA1 --build-arg GITHUB_OAUTH_TOKEN --build-arg PROJECT_USERNAME=$CIRCLE_PROJECT_USERNAME --build-arg PROJECT_REPONAME=$CIRCLE_PROJECT_REPONAME --build-arg QEMU_PLATFORM=armv7hf --build-arg VERSION --file $GOPATH/src/github.com/skycoin/libskycoin/docker/images/deploy-arm/Dockerfile $GOPATH/src/github.com/skycoin/libskycoin -t skydev-deploy - docker build --build-arg SHA1=$CIRCLE_SHA1 --build-arg GITHUB_OAUTH_TOKEN --build-arg PROJECT_USERNAME=$CIRCLE_PROJECT_USERNAME --build-arg PROJECT_REPONAME=$CIRCLE_PROJECT_REPONAME --build-arg QEMU_PLATFORM=aarch64 --build-arg VERSION --file $GOPATH/src/github.com/skycoin/libskycoin/docker/images/deploy-arm/Dockerfile $GOPATH/src/github.com/skycoin/libskycoin -t skydev-deploy + docker build --build-arg SHA1=$CIRCLE_SHA1 --build-arg GITHUB_OAUTH_TOKEN --build-arg PROJECT_USERNAME=$CIRCLE_PROJECT_USERNAME --build-arg PROJECT_REPONAME=$CIRCLE_PROJECT_REPONAME --build-arg QEMU_PLATFORM --build-arg VERSION --file $GOPATH/src/github.com/fibercrypto/libskycoin/docker/images/deploy-arm/Dockerfile $GOPATH/src/github.com/fibercrypto/libskycoin -t skydev-deploy fi \ No newline at end of file diff --git a/docker/images/deploy-arm/Dockerfile b/docker/images/deploy-arm/Dockerfile index f1b7c3846..c2f1c2661 100644 --- a/docker/images/deploy-arm/Dockerfile +++ b/docker/images/deploy-arm/Dockerfile @@ -20,6 +20,6 @@ ENV OS="Linux" RUN make -C $GOPATH/src/github.com/fibercrypto/libskycoin build RUN tar -czf libskycoin-${VERSION}-${OS}-${ARCH}.tar.gz -C $GOPATH/src/github.com/fibercrypto/libskycoin/build $GOPATH/src/github.com/fibercrypto/libskycoin/build/* RUN go get github.com/tcnksm/ghr -RUN ghr -t ${GITHUB_OAUTH_TOKEN} -u ${PROJECT_USERNAME} -r ${PROJECT_REPONAME} -c ${SHA1} -replace -draft ${VERSION} libskycoin-${VERSION}-${OS}-${ARCH}.tar.gz +RUN ghr -t ${GITHUB_OAUTH_TOKEN} -u ${PROJECT_USERNAME} -r ${PROJECT_REPONAME} -c ${SHA1} -replace -draft -n "libskycoin ${VERSION}" ${VERSION} libskycoin-${VERSION}-${OS}-${ARCH}.tar.gz RUN [ "cross-build-end" ] \ No newline at end of file diff --git a/vendor/vendor.json b/vendor/vendor.json index 8184540a3..4b9b39b9e 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -293,5 +293,5 @@ "revisionTime": "2019-03-03T16:38:25Z" } ], - "rootPath": "github.com/skycoin/libskycoin" + "rootPath": "github.com/fibercrypto/libskycoin" }