diff options
| -rw-r--r-- | .gitlab-ci.yml | 22 | ||||
| -rw-r--r-- | config/projects/asdf-mono.rb | 20 | ||||
| -rw-r--r-- | config/projects/asdf-ruby.rb (renamed from config/projects/asdf.rb) | 9 | ||||
| -rw-r--r-- | omnibus.rb | 1 |
4 files changed, 35 insertions, 17 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 83a738f..92ca96c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,6 +13,13 @@ variables: GIT_STRATEGY: fetch TMP_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA +default: + image: $TMP_IMAGE + stage: release + artifacts: + paths: + - pkg/ + expire_in: 1 week build-docker-image: image: docker:stable @@ -24,13 +31,10 @@ build-docker-image: - docker build -t $TMP_IMAGE . - docker push $TMP_IMAGE -release-deb: - image: $TMP_IMAGE - stage: release +ruby-deb: script: - - bundle exec omnibus build asdf - - find /opt/asdf - artifacts: - paths: - - pkg/ - expire_in: 1 week + - bundle exec omnibus build asdf-ruby + +mono-deb: + script: + - bundle exec omnibus build asdf-mono diff --git a/config/projects/asdf-mono.rb b/config/projects/asdf-mono.rb new file mode 100644 index 0000000..647dbd2 --- /dev/null +++ b/config/projects/asdf-mono.rb @@ -0,0 +1,20 @@ +asdf "name-mono" +maintainer "mkhan@gitlab.com" +homepage "https://gitlab.com/xlgmokha/omnibus-asdf" + +# Defaults to C:/asdf on Windows +# and /opt/asdf on all other platforms +install_dir "/opt/asdf" + +build_version "0.1.0" +build_iteration 1 + +# Creates required build directories +dependency "preparation" +dependency "asdf-mono-6-8-0-123" + +# asdf dependencies/components +# dependency "somedep" + +#exclude "**/.git" +#exclude "**/bundler/git" diff --git a/config/projects/asdf.rb b/config/projects/asdf-ruby.rb index 903df5b..a1cdd33 100644 --- a/config/projects/asdf.rb +++ b/config/projects/asdf-ruby.rb @@ -1,10 +1,4 @@ -# -# Copyright 2020 Mo Khan -# -# All Rights Reserved. -# - -name "asdf" +name "asdf-ruby" maintainer "mkhan@gitlab.com" homepage "https://gitlab.com/xlgmokha/omnibus-asdf" @@ -29,7 +23,6 @@ dependency "asdf-ruby-2-6-5" dependency "asdf-ruby-2-6-6" dependency "asdf-ruby-2-7-0" dependency "asdf-ruby-2-7-1" -dependency "asdf-mono-6-8-0-123" # asdf dependencies/components # dependency "somedep" @@ -23,6 +23,7 @@ source_dir './local/omnibus/src' build_dir './local/omnibus/build' package_dir './local/omnibus/pkg' package_tmp './local/omnibus/pkg-tmp' +append_timestamp false # Disable git caching # ------------------------------ |