Skip to content

Commit ea01dfc

Browse files
author
bogyo210
committed
introduce focal
1 parent 5df241d commit ea01dfc

8 files changed

+141
-73
lines changed

‎.semaphore/sem-version_bionic.txt

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
sem-version firefox 52
2+
firefox --version | grep -q 52
3+
sem-version firefox 78
4+
firefox --version | grep -q 78
5+
sem-version ruby 2.5.3
6+
ruby --version | grep 2.5.3
7+
sem-version ruby 2.5.2
8+
ruby --version | grep 2.5.2
9+
sem-version ruby 2.5.3
10+
ruby --version | grep 2.5.3
11+
sem-version ruby 2.3.7
12+
ruby --version | grep 2.3.7
13+
sem-version c 8
14+
gcc --version | grep " 8."
15+
sem-version cpp 7
16+
gcc --version | grep " 7."
17+
sem-version php 7.2.31
18+
php -v | grep 7.2.31
19+
sem-version php 7.0.33
20+
php -v | grep 7.0.33
21+
sem-version php 7.4
22+
php -v | grep 7.4
23+
phpbrew ext install xdebug
24+
php -m | grep xdebug
25+
sem-version php 7.3.19
26+
php -m | grep magick
27+
php -m | grep gd
28+
php -m | grep imap
29+
which composer | grep 7.3.19
30+
sem-version elixir 1.7.4
31+
time sem-version node 12.16.1
32+
node --version | grep 12.16.1
33+
nodejs --version | grep 12.16.1
34+
time sem-version node 14
35+
node --version | grep 14
36+
sem-version ruby 2.6.6
37+
ruby --version | grep 2.6.6
38+
bundler --version | grep 2
39+
mkdir ruby_test
40+
echo "2.7.2" > ruby_test/.ruby-version
41+
cd ruby_test
42+
ruby --version| grep 2.7.2
43+
sem-version ruby 2.3.7 -f
44+
ruby --version| grep 2.3.7
45+
kubectl version --client
46+
sem-version kubectl 1.15.3
47+
kubectl version --client | grep -q 1.15.3
48+
echo "Erlang version"
49+
erl -eval 'erlang:display(erlang:system_info(otp_release)), halt().' -noshell
50+
sem-version erlang 20
51+
erl -eval 'erlang:display(erlang:system_info(otp_release)), halt().' -noshell
52+
sem-version erlang 21
53+
erl -eval 'erlang:display(erlang:system_info(otp_release)), halt().' -noshell
54+
echo "actual scala version"
55+
scala -version
56+
sem-version scala 2.11
57+
sem-version scala 2.12

‎.semaphore/sem-version_focal.txt

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
sem-version firefox 52
2+
firefox --version | grep -q 52
3+
sem-version firefox 78
4+
firefox --version | grep -q 78
5+
sem-version c 10
6+
gcc --version | grep " 10."
7+
sem-version cpp 9
8+
gcc --version | grep " 9."
9+
sem-version php 7.4.1
10+
php -v | grep 7.4.1
11+
sem-version php 7.4
12+
php -v | grep 7.4
13+
phpbrew ext install xdebug
14+
php -m | grep xdebug
15+
sem-version php 7.4.14
16+
php -m | grep magick
17+
php -m | grep gd
18+
php -m | grep imap
19+
which composer | grep 7.4.14
20+
time sem-version node 12.16.1
21+
node --version | grep 12.16.1
22+
nodejs --version | grep 12.16.1
23+
time sem-version node 14
24+
node --version | grep 14
25+
sem-version ruby 2.6.1
26+
ruby --version | grep 2.6.1
27+
bundler --version | grep 2
28+
mkdir ruby_test
29+
echo "2.7.2" > ruby_test/.ruby-version
30+
cd ruby_test
31+
ruby --version| grep 2.7.2
32+
sem-version ruby 2.6.2 -f
33+
ruby --version| grep 2.6.2
34+
kubectl version --client
35+
sem-version kubectl 1.15.3
36+
kubectl version --client | grep -q 1.15.3
37+
echo "Erlang version"
38+
erl -eval 'erlang:display(erlang:system_info(otp_release)), halt().' -noshell
39+
sem-version erlang 23
40+
erl -eval 'erlang:display(erlang:system_info(otp_release)), halt().' -noshell
41+
sem-version erlang 23.2
42+
erl -eval 'erlang:display(erlang:system_info(otp_release)), halt().' -noshell
43+
echo "actual scala version"
44+
scala -version

‎.semaphore/semaphore.yml

+18-66
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ global_job_config:
1212
prologue:
1313
commands:
1414
# Disconnect from cache server
15-
- export SEMAPHORE_CACHE_URL=""
16-
- export SEMAPHORE_CACHE_USERNAME=""
1715
- checkout
1816
- bash release/create.sh
1917

@@ -37,79 +35,33 @@ blocks:
3735
- 'shellcheck libcheckout -f gcc | wc -l && [[ "$(shellcheck libcheckout -f gcc | wc -l)" -le 89 ]]'
3836
- shellcheck install-package
3937

40-
- name: Sem Version Tests
38+
- name: Sem Version Tests bionic
4139
dependencies: []
4240
task:
4341
prologue:
4442
commands:
4543
- bash release/install_in_tests.sh
4644

45+
4746
jobs:
48-
- name: Sem Version
49-
commands:
50-
- sem-version firefox 52
51-
- firefox --version | grep -q 52
52-
- sem-version firefox 78
53-
- firefox --version | grep -q 78
54-
- sem-version ruby 2.5.3
55-
- ruby --version | grep 2.5.3
56-
- sem-version ruby 2.5.2
57-
- ruby --version | grep 2.5.2
58-
- sem-version ruby 2.5.3
59-
- ruby --version | grep 2.5.3
60-
- sem-version ruby 2.3.7
61-
- ruby --version | grep 2.3.7
62-
- sem-version c 8
63-
- gcc --version | grep " 8."
64-
- sem-version cpp 7
65-
- gcc --version | grep " 7."
66-
- sem-version php 7.2.31
67-
- php -v | grep 7.2.31
68-
- sem-version php 7.0.33
69-
- php -v | grep 7.0.33
70-
- sem-version php 7.4
71-
- php -v | grep 7.4
72-
- phpbrew ext install xdebug
73-
- php -m | grep xdebug
74-
- sem-version php 7.3.19
75-
- php -m | grep magick
76-
- php -m | grep gd
77-
- php -m | grep imap
78-
- which composer | grep 7.3.19
79-
- sem-version elixir 1.7.4
80-
- time sem-version node 12.16.1
81-
- node --version | grep 12.16.1
82-
- nodejs --version | grep 12.16.1
83-
- time sem-version node 14
84-
- node --version | grep 14
85-
- sem-version ruby 2.6.6
86-
- ruby --version | grep 2.6.6
87-
- bundler --version | grep 2
88-
- mkdir ruby_test
89-
- echo "2.7.2" > ruby_test/.ruby-version
90-
- cd ruby_test
91-
- ruby --version| grep 2.7.2
92-
- sem-version ruby 2.3.7 -f
93-
- ruby --version| grep 2.3.7
94-
- kubectl version --client
95-
- sem-version kubectl 1.15.3
96-
- kubectl version --client | grep -q 1.15.3
47+
- name: Sem Version
48+
commands_file: sem-version_bionic.txt
9749

98-
- name: Erlang change test
99-
commands:
100-
- echo "Erlang version"
101-
- 'erl -eval ''erlang:display(erlang:system_info(otp_release)), halt().'' -noshell'
102-
- sem-version erlang 20
103-
- 'erl -eval ''erlang:display(erlang:system_info(otp_release)), halt().'' -noshell'
104-
- sem-version erlang 21
105-
- 'erl -eval ''erlang:display(erlang:system_info(otp_release)), halt().'' -noshell'
50+
- name: Sem Version Tests focal
51+
dependencies: []
52+
task:
53+
agent:
54+
machine:
55+
type: g1-standard-2
56+
os_image: ubuntu1804
57+
prologue:
58+
commands:
59+
- bash release/install_in_tests.sh
60+
- source ~/.toolbox/toolbox
61+
jobs:
62+
- name: Sem Version focal
63+
commands_file: sem-version_focal.txt
10664

107-
- name: scala change test
108-
commands:
109-
- echo "actual scala version"
110-
- scala -version
111-
- sem-version scala 2.11
112-
- sem-version scala 2.12
11365

11466
- name: Sem Service Tests
11567
dependencies: []

‎install-toolbox

+8
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,13 @@ else
9595
echo "toolbox_install_error{module='install-package'} 1" >> /tmp/toolbox_metrics
9696
fi
9797

98+
install_cmd mv ~/.toolbox/artifact $INSTALL_PATH/artifact
99+
install_cmd chmod +x $INSTALL_PATH/artifact
100+
if [[ $? -eq 0 ]];then
101+
echo "artifacts installed"
102+
else
103+
echo "toolbox_install_error{module='artifacts'} 1" >> /tmp/toolbox_metrics
104+
fi
98105

99106
echo "Installing the artifacts CLI"
100107
install_cmd mv ~/.toolbox/artifact $INSTALL_PATH/artifact
@@ -116,6 +123,7 @@ if [[ `uname` != "Darwin" ]]; then
116123
echo "toolbox_install_error{module='spc'} 1" >> /tmp/toolbox_metrics
117124
fi
118125

126+
119127
echo "Installing the when CLI"
120128
install_cmd mv ~/.toolbox/when $INSTALL_PATH/when
121129
install_cmd chmod +x $INSTALL_PATH/when

‎release/install_in_tests.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ case $(uname) in
2222
esac
2323

2424
bash ~/.toolbox/install-toolbox
25-
source ~/.toolbox/toolbox
25+
cat ~/.toolbox/toolbox >> ~/.bash_profile
26+
source ~/.bash_profile

‎sem-install

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
#!/bin/bash
2-
SEMAPHORE_PACKAGE_REPOSITORY="http://packages.semaphoreci.com"
2+
3+
install::package_url() {
4+
5+
echo "http://packages.semaphoreci.com/$(lsb_release -cs)"
6+
}
7+
38
install::available() {
4-
response=$(curl --write-out %{http_code} --head --silent --output /dev/null $SEMAPHORE_PACKAGE_REPOSITORY/${language}/${language_version}.tar.gz)
9+
response=$(curl --write-out %{http_code} --head --silent --output /dev/null $(install::package_url)/${language}/${language_version}.tar.gz)
510
if [[ $response -ne 200 ]]; then
611
echo 1
712
else
@@ -10,7 +15,7 @@ install::available() {
1015
}
1116

1217
install::download() {
13-
curl --silent $SEMAPHORE_PACKAGE_REPOSITORY/${language}/${language_version}.tar.gz --output ${language_version}.tar.gz
18+
curl --silent $(install::package_url)/${language}/${language_version}.tar.gz --output ${language_version}.tar.gz
1419
}
1520

1621
install::install_node() {

‎sem-version

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/bash
2-
source ~/.toolbox/sem-install
32

43
# Changing language versions
54
VERSION="0.7"
@@ -27,9 +26,10 @@ version::metrics() {
2726
local duration
2827
start=$(date +%s%3N)
2928
$cmd
29+
ch_status=$?
3030
end=$(date +%s%3N)
3131
TOTAL_TIME=$(( $end - $start ))
32-
return 0
32+
return $ch_status
3333
}
3434
version::change() {
3535
command=$1
@@ -71,7 +71,7 @@ version::change_php() {
7171
[[ "$software_version" == "7.1" ]] && software_version="7.1.33"
7272
[[ "$software_version" == "7.2" ]] && software_version="7.2.34"
7373
[[ "$software_version" == "7.3" ]] && software_version="7.3.24"
74-
[[ "$software_version" == "7.4" ]] && software_version="7.4.12"
74+
[[ "$software_version" == "7.4" ]] && software_version="7.4.14"
7575

7676
if ! [ -d ~/.phpbrew/php/php-"${software_version}" ]; then
7777
sem-install php "${software_version}"

‎toolbox

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
source ~/.toolbox/sem-install
12
source ~/.toolbox/sem-version
23
source ~/.toolbox/libcheckout
34
source ~/.toolbox/libchecksum

0 commit comments

Comments
 (0)