Clean up pipeline script

DataDog · Jul 21, 2023 · bcbf3fc · bcbf3fc
1 parent 8dd90f2
commit bcbf3fc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -36,6 +36,7 @@ build-image:
   image: $DOCKER_REGISTRY/docker:20.10.13
   parallel:
     matrix:
+      # ADD NEW RUBIES HERE
       - RUBY_VERSION: [ '3.2.2', '3.1.4', '3.0.6', '2.7.8' ]
   script:
     - >
@@ -52,6 +53,7 @@ promote-image:
   image: $DOCKER_REGISTRY/docker:20.10.13
   parallel:
     matrix:
+      # ADD NEW RUBIES HERE
       - RUBY_VERSION: [ '3.2.2', '3.1.4', '3.0.6', '2.7.8' ]
   script:
     - docker pull $RUBY_CUSTOM_IMAGE_BASE/$RUBY_VERSION:$CI_PIPELINE_ID
@@ -67,7 +69,9 @@ install-base-ruby-gems:
     - if: '$CI_COMMIT_TAG =~ /^v.*/'
       when: on_success
   script:
-    - .gitlab/install-gem-to-folder.sh
+    # This would install all dependencies
+    - .gitlab/.gitlab/prepare_pkg_directory.sh
+    - ruby pkg/install_ddtrace_deps.rb debase-ruby_core_source libdatadog libddwaf msgpack ffi ddtrace
   artifacts:
     paths:
       - pkg
@@ -85,7 +89,7 @@ install-version-dependant-gems:
   stage: package
   needs: [ "install-base-ruby-gems" ]
   script:
-    - .gitlab/install-gem-to-folder-version-specific.sh
+    - ruby pkg/install_ddtrace_deps.rb msgpack ffi ddtrace
   artifacts:
     paths:
       - pkg

diff --git a/.gitlab/install-gem-to-folder-version-specific.sh b/.gitlab/install-gem-to-folder-version-specific.sh
diff --git a/.gitlab/install-gem-to-folder.sh → .gitlab/prepare_pkg_directory.sh b/.gitlab/install-gem-to-folder.sh → .gitlab/prepare_pkg_directory.sh
@@ -19,5 +19,3 @@ cp Gemfile pkg
 cp Gemfile.lock pkg
 cp .gitlab/install_ddtrace_deps.rb pkg
 cp lib-injection/host_inject.rb pkg
-
-ruby pkg/install_ddtrace_deps.rb debase-ruby_core_source libdatadog libddwaf msgpack ffi ddtrace