diff options
| -rw-r--r-- | .gitlab-ci.yml | 7 | ||||
| -rw-r--r-- | ci/deps.sh | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e34dcc4c..e53b91732 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,4 @@ -# use the official gcc image, based on debian -# can use versions as well, like gcc:5.2 -# see https://hub.docker.com/_/gcc/ -image: gcc +image: ubuntu:16.04 stages: - pre-build @@ -85,6 +82,8 @@ test-windows: .csources: &csources_definition stage: test script: + - apt-get update -qq + - apt-get install -y -qq build-essential git - nim -v - ./koch csources - ./koch xz diff --git a/ci/deps.sh b/ci/deps.sh index 0334e873e..50680e604 100644 --- a/ci/deps.sh +++ b/ci/deps.sh @@ -1,11 +1,13 @@ # Some debug info echo "Running on $CI_RUNNER_ID ($CI_RUNNER_DESCRIPTION) with tags $CI_RUNNER_TAGS." -gcc -v + # Packages apt-get update -qq -apt-get install -y -qq libcurl4-openssl-dev libsdl1.2-dev libgc-dev nodejs fasm +apt-get install -y -qq build-essential git libcurl4-openssl-dev libsdl1.2-dev libgc-dev nodejs fasm + +gcc -v -which fasm +fasm -v export PATH=$(pwd)/bin:$PATH # Nimble deps |