diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2022-09-04 15:15:18 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2022-09-05 01:33:22 +0200 |
| commit | 06c1b20ec726faaf303dadffeca8450f945cc567 (patch) | |
| tree | 9495a9a305fcd1e48808ffdd155f8ecf06b5c5a7 | |
| parent | 57656d7fe467af8a74a6df0abb1814411e3efd40 (diff) | |
Added activate.sh script and run CI test.v1.0
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | .github/workflows/build.yml | 9 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 8 | ||||
| -rwxr-xr-x | mingw-w64-build | 23 |
3 files changed, 28 insertions, 12 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e5b1825..284cd2a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,6 +42,15 @@ jobs: - name: SHA512 run: | sha512sum -b ./mingw-w64-toolchain.tbz2 >./mingw-w64-toolchain.tbz2.sha512 + - name: Activate + run: | + mkdir tmp + cd tmp + tar -xjf ../mingw-w64-toolchain.tbz2 + cd .. + source ./tmp/mingw-w64-sysroot/activate.sh + x86_64-w64-mingw32-gcc -v + x86_64-w64-mingw32-g++ -v - uses: actions/upload-artifact@v2 with: name: mingw-w64-toolchain diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 947c888..b8f5b08 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,7 @@ image: debian:stable stages: - build + - activate before_script: - export DEBIAN_FRONTEND=noninteractive @@ -29,6 +30,13 @@ build: script: - ./mingw-w64-build --jobs 8 --keep-artifacts --tarball ./x86_64-w64-mingw32-toolchain.tbz2 x86_64 - sha512sum -b ./x86_64-w64-mingw32-toolchain.tbz2 >./x86_64-w64-mingw32-toolchain.tbz2.sha512 + - mkdir tmp + - cd tmp + - tar -xjf ../x86_64-w64-mingw32-toolchain.tbz2 + - cd .. + - source ./tmp/mingw-w64-sysroot/activate.sh + - x86_64-w64-mingw32-gcc -v + - x86_64-w64-mingw32-g++ -v artifacts: expire_in: 1 week paths: diff --git a/mingw-w64-build b/mingw-w64-build index af833a8..c4879dc 100755 --- a/mingw-w64-build +++ b/mingw-w64-build @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Copyright (C) 2022 Kyle Schwarz <zeranoe@gmail.com>, Toni Uhlig <matzeton@googlemail.com> # @@ -517,29 +517,28 @@ export CFLAGS="-g0" export CXXFLAGS="-g0" export LDFLAGS="-s" -COMPLETE_MSG="complete, to use MinGW-w64 everywhere add" - if [ "$BUILD_I686" ]; then build i686 "$I686_PREFIX" - COMPLETE_MSG="$COMPLETE_MSG '$I686_PREFIX/bin'" fi if [ "$BUILD_X86_64" ]; then build x86_64 "$X86_64_PREFIX" - if [ "$BUILD_I686" ]; then - COMPLETE_MSG="$COMPLETE_MSG and " - fi - COMPLETE_MSG="$COMPLETE_MSG '$X86_64_PREFIX/bin'" fi -COMPLETE_MSG="$COMPLETE_MSG to PATH." - if [ ! "$KEEP_ARTIFACTS" ]; then remove_path "$SRC_PATH" remove_path "$BLD_PATH" remove_path "$LOG_FILE" fi +cat >${ROOT_PATH}/activate.sh <<EOF +#!/usr/bin/env bash + +MYDIR="\$(realpath \$(dirname \${BASH_SOURCE[0]}))" +export PATH="\${MYDIR}/i686/bin:\${MYDIR}/x86_64/bin:\${PATH}" +EOF +chmod +x ${ROOT_PATH}/activate.sh + if [ ! -z ${TARBALL} ]; then if [ "$BUILD_I686" ]; then TAR_DIRS="i686" @@ -548,9 +547,9 @@ if [ ! -z ${TARBALL} ]; then TAR_DIRS="${TAR_DIRS} x86_64" fi execute "generating tarball ${TARBALL}" "" \ - cd ${ROOT_PATH} && tar --transform "s,^,mingw-w64-sysroot/," -cjf ${TARBALL} ${TAR_DIRS} + cd ${ROOT_PATH} && tar --transform "s,^,mingw-w64-sysroot/," -cjf ${TARBALL} ${TAR_DIRS} activate.sh fi -printf "(%d/%d): %s\n" "$CURRENT_STEP" "$TOTAL_STEPS" "$COMPLETE_MSG" +printf "(%d/%d): %s\n" "$CURRENT_STEP" "$TOTAL_STEPS" "complete, to use MinGW-w64 everywhere run: source ${ROOT_PATH}/activate.sh" exit 0 |