diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2c6ec5..37f97f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,19 +78,6 @@ ruby-2.6.2-git-2.18-chrome-71.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker- # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml ruby-2.4.5-git-2.18-chrome-69.0-docker-18.06.1 test: *test_custom -# Not used anymore (?) -golang-1.9-git-2.9.0 test: *test_custom -golang-1.9-git-2.14 test: *test_custom -golang-1.9-git-2.16 test: *test_custom -golang-1.9-git-2.17 test: *test_custom -golang-1.10-git-2.9.0 test: *test_custom -golang-1.10-git-2.14 test: *test_custom -golang-1.10-git-2.16 test: *test_custom -golang-1.10-git-2.17 test: *test_custom - -# Used by https://gitlab.com/gitlab-org/trello-power-up/blob/master/.gitlab-ci.yml (?) -node-8.9-chrome-63.0-yarn-1.2 test: *test_custom - # Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/ ruby-2.3-ansible-2.5.1-terraform-0.11 test: *test_custom @@ -107,7 +94,6 @@ omnibus-gitlab-jessie test: *test_build omnibus-gitlab-opensuse42.3 test: *test_build omnibus-gitlab-stretch test: *test_build omnibus-gitlab-trusty test: *test_build -omnibus-gitlab-wheezy test: *test_build omnibus-gitlab-xenial test: *test_build omnibus-gitlab-depscan test: *test_build release-tools test: *test_build @@ -142,21 +128,6 @@ ruby-2.6.2-git-2.18-chrome-71.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker- # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml ruby-2.4.5-git-2.18-chrome-69.0-docker-18.06.1: *build_and_deploy_custom -# Used by https://gitlab.com/gitlab-org/trello-power-up/blob/master/.gitlab-ci.yml (?) -node-8.9-chrome-63.0-yarn-1.2: *build_and_deploy_custom - -# Not used anymore (?) -golang-1.8.6-git-2.9.0: *build_and_deploy_custom -golang-1.8.6-git-2.14: *build_and_deploy_custom -golang-1.9-git-2.9.0: *build_and_deploy_custom -golang-1.9-git-2.14: *build_and_deploy_custom -golang-1.9-git-2.16: *build_and_deploy_custom -golang-1.9-git-2.17: *build_and_deploy_custom -golang-1.10-git-2.9.0: *build_and_deploy_custom -golang-1.10-git-2.14: *build_and_deploy_custom -golang-1.10-git-2.16: *build_and_deploy_custom -golang-1.10-git-2.17: *build_and_deploy_custom - # Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/ ruby-2.3-ansible-2.5.1-terraform-0.11: *build_and_deploy_custom @@ -173,7 +144,6 @@ omnibus-gitlab-jessie: *build_and_deploy omnibus-gitlab-opensuse42.3: *build_and_deploy omnibus-gitlab-stretch: *build_and_deploy omnibus-gitlab-trusty: *build_and_deploy -omnibus-gitlab-wheezy: *build_and_deploy omnibus-gitlab-xenial: *build_and_deploy omnibus-gitlab-depscan: *build_and_deploy release-tools: *build_and_deploy diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index 3f031d4..eb9b2a3 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -6,10 +6,6 @@ IFS=$'\n\t' function print_golang_args() { case "$1" in - 1.8|1.8.6) - INSTALL_GOLANG_VERSION=1.8.6 - GOLANG_DOWNLOAD_SHA256=f558c91c2f6aac7222e0bd83e6dd595b8fac85aaa96e55d15229542eb4aaa1ff - ;; 1.9) INSTALL_GOLANG_VERSION=1.9.4 GOLANG_DOWNLOAD_SHA256=15b0937615809f87321a457bb1265f946f9f6e736c563d6c5e0bd2c22e44f779 @@ -38,42 +34,6 @@ function print_golang_args() { # You may need to bump the version in scripts/install-chrome. function print_chrome_args() { case "$1" in - 60|60.0) - CHROME_VERSION=60.0.3112.90-1 - CHROME_DRIVER_VERSION=2.33 - ;; - 61|61.0) - CHROME_VERSION=61.0.3163.100-1 - CHROME_DRIVER_VERSION=2.34 - ;; - 62|62.0) - CHROME_VERSION=62.0.3202.89-1 - CHROME_DRIVER_VERSION=2.35 - ;; - 63|63.0) - CHROME_VERSION=63.0.3239.132-1 - CHROME_DRIVER_VERSION=2.36 - ;; - 64|64.0) - CHROME_VERSION=64.0.3282.186-1 - CHROME_DRIVER_VERSION=2.36 - ;; - 65|65.0) - CHROME_VERSION=65.0.3325.181-1 - CHROME_DRIVER_VERSION=2.36 - ;; - 66|66.0) - CHROME_VERSION=66.0.3359.181-1 - CHROME_DRIVER_VERSION=2.40 - ;; - 67|67.0) - CHROME_VERSION=67.0.3396.79-1 - CHROME_DRIVER_VERSION=2.40 - ;; - 68|68.0) - CHROME_VERSION=68.0.3440.106-1 - CHROME_DRIVER_VERSION=2.41 - ;; 69|69.0) CHROME_VERSION=69.0.3497.81-1 CHROME_DRIVER_VERSION=2.41 @@ -90,35 +50,6 @@ function print_chrome_args() { function print_git_args() { case "$1" in - 2.7) - # Code-debt: When the build refers to "git 2.7" its actually "default" git. - # so don't actually install a git 2.7 as a default copy is already installed - return - ;; - 2.8|2.8.4) - GIT_VERSION=2.8.4 - GIT_DOWNLOAD_SHA256=626e319f8a24fc0866167ea5f6bf3e2f38f69d6cb2e59e150f13709ca3ebf301 - ;; - 2.9|2.9.0) - GIT_VERSION=2.9.0 - GIT_DOWNLOAD_SHA256=bff7560f5602fcd8e37669e0f65ef08c6edc996e4f324e4ed6bb8a84765e30bd - ;; - 2.13) - GIT_VERSION=2.13.6 - GIT_DOWNLOAD_SHA256=cb53e6b388d8d19189933366c1fe5c1ca500e8b227b9e707af39c3d879e41015 - ;; - 2.14) - GIT_VERSION=2.14.4 - GIT_DOWNLOAD_SHA256=0556330e267dc968749619cd90ff6a815eda26f0c89faa5cfba56756e852202f - ;; - 2.16) - GIT_VERSION=2.16.4 - GIT_DOWNLOAD_SHA256=e8709ebcda3d793cd933ca55004814959bb8e6fa518b5b37f602d9881e489d2e - ;; - 2.17) - GIT_VERSION=2.17.1 - GIT_DOWNLOAD_SHA256=ec6452f0c8d5c1f3bcceabd7070b8a8a5eea11d4e2a04955c139b5065fd7d09a - ;; 2.18) GIT_VERSION=2.18.0 GIT_DOWNLOAD_SHA256=94faf2c0b02a7920b0b46f4961d8e9cad08e81418614102898a55f980fa3e7e4 @@ -136,7 +67,6 @@ function print_git_args() { function print_node_args() { case "$1" in - 7.x|7.1) NODE_INSTALL_VERSION=7.x ;; 8.x) NODE_INSTALL_VERSION=8.x ;; 10.x) NODE_INSTALL_VERSION=10.x ;; *) echo "Unknown node version $1"; exit 1; @@ -146,8 +76,6 @@ function print_node_args() { function print_yarn_args() { case "$1" in - 1.0) YARN_INSTALL_VERSION=1.0.2-1 ;; - 1.2) YARN_INSTALL_VERSION=1.2.1-1 ;; 1.12) YARN_INSTALL_VERSION=1.12.3-1 ;; *) echo "Unknown yarn version $1"; exit 1; esac