[Git][cmucl/cmucl][master] 2 commits: Simplify script by adding variables.

[Raymond Toy]

Raymond Toy pushed to branch master at cmucl / cmucl


Commits:
1cbde1a1 by Raymond Toy at 2018-01-21T13:31:37-08:00
Simplify script by adding variables.

Add variables to the download url and for the version so we can share
them across linux and osx builds.

- - - - -
63199010 by Raymond Toy at 2018-01-21T22:44:23+00:00
Merge branch 'rtoy-simplify-ci' into 'master'

Simplify script by adding variables.

See merge request cmucl/cmucl!30
- - - - -


1 changed file:

- .gitlab-ci.yml


Changes:

=====================================
.gitlab-ci.yml
=====================================
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,16 @@
+variables:
+  download_url: "https://common-lisp.net/project/cmucl/downloads/snapshots/2018/01"
+  version: "2018-01-x86"
+
 linux-runner:
   tags:
     - linux
   before_script:
     - apt-get update -qq && apt-get install -y wget bzip2 make gcc gcc-multilib time bc git
-    - wget -nv https://common-lisp.net/project/cmucl/downloads/snapshots/2018/01/cmucl-2018-01-x86-linux.tar.bz2
-    - wget -nv https://common-lisp.net/project/cmucl/downloads/snapshots/2018/01/cmucl-2018-01-x86-linux.extra.tar.bz2
+    - wget -nv $download_url/cmucl-$version-linux.tar.bz2
+    - wget -nv $download_url/cmucl-$version-linux.extra.tar.bz2
     - mkdir snapshot
-    - (cd snapshot; tar xjf ../cmucl-2018-01-x86-linux.tar.bz2; tar xjf ../cmucl-2018-01-x86-linux.extra.tar.bz2)
+    - (cd snapshot; tar xjf ../cmucl-$version-linux.tar.bz2; tar xjf ../cmucl-$version-linux.extra.tar.bz2)
   script:
     - bin/build.sh -C "" -o snapshot/bin/lisp
     - bin/make-dist.sh -I dist linux-4
@@ -16,9 +20,9 @@ osx-runner:
   tags:
     - osx
   before_script:
-    - curl -s -o cmucl-2018-01-x86-darwin.tar.bz2 https://common-lisp.net/project/cmucl/downloads/snapshots/2018/01//cmucl-2018-01-x86-darwin.tar.bz2
+    - curl -s -o cmucl-$version-darwin.tar.bz2 $download_url/cmucl-$version-darwin.tar.bz2
     - mkdir snapshot
-    - (cd snapshot; tar xjf ../cmucl-2018-01-x86-darwin.tar.bz2)
+    - (cd snapshot; tar xjf ../cmucl-$version-darwin.tar.bz2)
   script:
     - bin/build.sh -C "" -o snapshot/bin/lisp
     - bin/make-dist.sh -I dist darwin-4



View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/5df2081377d7f79f5e289275687e614f01c8ecdf...631990102d817923c0fadcdad841695570d6e1cb

---
View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/5df2081377d7f79f5e289275687e614f01c8ecdf...631990102d817923c0fadcdad841695570d6e1cb
You're receiving this email because of your account on gitlab.common-lisp.net.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mailman.common-lisp.net/pipermail/cmucl-cvs/attachments/20180121/6672acdc/attachment-0001.html>