Skip to content

Commit 613ee04

Browse files
committed
Update Tarball generation for Ubuntu 20.04 Focal Fossa.
NodeJS v18 is not compatible with Ubuntu 16.04, due to the GLIBC mismatch.
1 parent e681750 commit 613ee04

File tree

2 files changed

+12
-75
lines changed

2 files changed

+12
-75
lines changed

.gitlab/build-deps.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -373,12 +373,12 @@ rm -f $PACKAGES_DIR/release-1.10.0.tar.gz
373373
#######
374374

375375
cd $PACKAGES_DIR
376-
wget --no-verbose --no-clobber https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.xz
377-
tar -xf node-v16.20.2-linux-x64.tar.xz -C $DEPS_INSTALL_RUNTIME_DIR
378-
rm -f node-v16.20.2-linux-x64.tar.xz
376+
wget --no-verbose --no-clobber https://nodejs.org/dist/v18.20.2/node-v18.20.2-linux-x64.tar.xz
377+
tar -xf node-v18.20.2-linux-x64.tar.xz -C $DEPS_INSTALL_RUNTIME_DIR
378+
rm -f node-v18.20.2-linux-x64.tar.xz
379379

380380
cd $DEPS_INSTALL_RUNTIME_DIR
381-
mv node-v16.20.2-linux-x64 node-install
381+
mv node-v18.20.2-linux-x64 node-install
382382
export PATH=$DEPS_INSTALL_RUNTIME_DIR/node-install/bin:$PATH
383383

384384
############

.gitlab/ci.yml

Lines changed: 8 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -61,65 +61,16 @@ variables:
6161
echo "GLIBC version: $GLIBC_VERSION"
6262
echo "GLIBCXX versions: $GLIBCXX_VERSIONS"
6363
64-
tarball suse-15:
64+
tarball ubuntu-20.04:
6565
extends: .tarball
66-
image: opensuse/leap:15
66+
image: ubuntu:20.04
6767
cache:
68-
key: "leap"
68+
key: "focal"
6969
variables:
7070
GCC_VERSION: 9.3.0
7171
ODB_VERSION: 2.5.0
72-
before_script:
73-
- zypper refresh
74-
- zypper update -y
75-
# download tools
76-
- zypper install -y curl wget gzip bzip2 unzip ca-certificates
77-
# build tools for CodeCompass
78-
- zypper install -y -t pattern devel_basis
79-
- zypper install -y binutils gcc-c++ gmp-devel
80-
# build tools for OpenLDAP
81-
- zypper install -y groff
82-
# build tools for ccdb-tools
83-
- zypper install -y libffi-devel
84-
# show GLIBC verison
85-
- *show-glibc-version
86-
87-
# Permanently disabled job
88-
# (Distribution package repository metadata not available anymore.)
89-
.tarball suse-42.1:
90-
extends: .tarball
91-
image: opensuse/archive:42.1
92-
cache:
93-
key: "malachite"
94-
variables:
95-
GCC_VERSION: 5.5.0
96-
ODB_VERSION: 2.4.0
97-
before_script:
98-
- zypper refresh
99-
- zypper update -y
100-
# download tools
101-
- zypper install -y curl wget gzip bzip2 unzip ca-certificates
102-
# build tools for CodeCompass
103-
- zypper install -y -t pattern devel_basis
104-
- zypper install -y binutils gcc-c++ gmp-devel
105-
# build tools for OpenLDAP
106-
- zypper install -y groff
107-
# build tools for ccdb-tools
108-
- zypper install -y libffi-devel
109-
# disable SSL certificate check (distribution's cacert is outdated)
110-
- echo "check_certificate = off" >> /etc/wgetrc
111-
- echo insecure >> ~/.curlrc
112-
# show GLIBC verison
113-
- *show-glibc-version
114-
115-
tarball ubuntu-16.04:
116-
extends: .tarball
117-
image: ubuntu:16.04
118-
cache:
119-
key: "xenial"
120-
variables:
121-
GCC_VERSION: 5.5.0
122-
ODB_VERSION: 2.4.0
72+
# No interactive timezone dialog for tzdata
73+
DEBIAN_FRONTEND: noninteractive
12374
before_script:
12475
- apt-get update -yqq
12576
# download tools
@@ -154,22 +105,8 @@ tarball ubuntu-16.04:
154105
- scp -P22 build/codecompass.tar.gz [email protected]:/var/www/codecompass/$FILENAME
155106
- ssh -p22 [email protected] "mv -f /var/www/codecompass/$FILENAME /var/www/codecompass/live/wwwroot/tarball/$FILENAME"
156107

157-
upload suse-15:
158-
extends: .upload
159-
variables:
160-
ARCH_SUFFIX: suse-15
161-
needs: ["tarball suse-15"]
162-
163-
# Permanently disabled job
164-
# (Distribution package repository metadata not available anymore.)
165-
.upload suse-42.1:
166-
extends: .upload
167-
variables:
168-
ARCH_SUFFIX: suse-42.1
169-
needs: ["tarball suse-42.1"]
170-
171-
upload ubuntu-16.04:
108+
upload ubuntu-20.04:
172109
extends: .upload
173110
variables:
174-
ARCH_SUFFIX: ubuntu-16.04
175-
needs: ["tarball ubuntu-16.04"]
111+
ARCH_SUFFIX: ubuntu-20.04
112+
needs: ["tarball ubuntu-20.04"]

0 commit comments

Comments
 (0)