Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8151b9c

Browse files
committed
[skip travis] fix deb.sh
1 parentcd15ba2 commit8151b9c

File tree

3 files changed

+33
-69
lines changed

3 files changed

+33
-69
lines changed

‎packaging/Makefile.test‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,9 @@ build/test_debian_10: build/test_debian_9_9.6 build/test_debian_9_10 build/test_
1515
@echo Debian 10: done
1616

1717
### UBUNTU
18-
build/test_ubuntu: build/test_ubuntu_14.04 build/test_ubuntu_16.04 build/test_ubuntu_18.04 build/test_ubuntu_20.04
18+
build/test_ubuntu: build/test_ubuntu_16.04 build/test_ubuntu_18.04 build/test_ubuntu_20.04
1919
@echo Ubuntu: done
2020

21-
build/test_ubuntu_14.04: build/test_ubuntu_14.04_9.6 build/test_ubuntu_14.04_10 build/test_ubuntu_14.04_11 build/test_ubuntu_14.04_12 build/test_ubuntu_14.04_13
22-
@echo Ubuntu 14.04:
23-
2421
build/test_ubuntu_16.04: build/test_ubuntu_16.04_9.6 build/test_ubuntu_16.04_10 build/test_ubuntu_16.04_11 build/test_ubuntu_16.04_12 build/test_ubuntu_16.04_13
2522
@echo Ubuntu 16.04: done
2623

‎packaging/test/Makefile.ubuntu‎

Lines changed: 32 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
# UBUNTU20.04
2-
build/test_ubuntu_20.04_9.6:
3-
$(call test_deb,ubuntu,20.04,focal,9.6,9.6.21)
4-
touch build/test_ubuntu_20.04_9.6
1+
# UBUNTU16.04
2+
build/test_ubuntu_16.04_9.6:
3+
$(call test_deb,ubuntu,16.04,xenial,9.6,9.6.21)
4+
touch build/test_ubuntu_16.04_9.6
55

6-
build/test_ubuntu_20.04_10:
7-
$(call test_deb,ubuntu,20.04,focal,10,10.16)
8-
touch build/test_ubuntu_20.04_10
6+
build/test_ubuntu_16.04_10:
7+
$(call test_deb,ubuntu,16.04,xenial,10,10.16)
8+
touch build/test_ubuntu_16.04_10
99

10-
build/test_ubuntu_20.04_11:
11-
$(call test_deb,ubuntu,20.04,focal,11,11.11)
12-
touch build/test_ubuntu_20.04_11
10+
build/test_ubuntu_16.04_11:
11+
$(call test_deb,ubuntu,16.04,xenial,11,11.11)
12+
touch build/test_ubuntu_16.04_11
1313

14-
build/test_ubuntu_20.04_12:
15-
$(call test_deb,ubuntu,20.04,focal,12,12.6)
16-
touch build/test_ubuntu_20.04_12
14+
build/test_ubuntu_16.04_12:
15+
$(call test_deb,ubuntu,16.04,xenial,12,12.6)
16+
touch build/test_ubuntu_16.04_12
1717

18-
build/test_ubuntu_20.04_13:
19-
$(call test_deb,ubuntu,20.04,focal,13,13.2)
20-
touch build/test_ubuntu_20.04_13
18+
build/test_ubuntu_16.04_13:
19+
$(call test_deb,ubuntu,16.04,xenial,13,13.2)
20+
touch build/test_ubuntu_16.04_13
2121

2222
# UBUNTU 18.04
2323
build/test_ubuntu_18.04_9.6:
@@ -40,44 +40,23 @@ build/test_ubuntu_18.04_13:
4040
$(call test_deb,ubuntu,18.04,bionic,13,13.2)
4141
touch build/test_ubuntu_18.04_13
4242

43-
# UBUNTU 16.04
44-
build/test_ubuntu_16.04_9.6:
45-
$(call test_deb,ubuntu,16.04,xenial,9.6,9.6.21)
46-
touch build/test_ubuntu_16.04_9.6
47-
48-
build/test_ubuntu_16.04_10:
49-
$(call test_deb,ubuntu,16.04,xenial,10,10.16)
50-
touch build/test_ubuntu_16.04_10
51-
52-
build/test_ubuntu_16.04_11:
53-
$(call test_deb,ubuntu,16.04,xenial,11,11.11)
54-
touch build/test_ubuntu_16.04_11
55-
56-
build/test_ubuntu_16.04_12:
57-
$(call test_deb,ubuntu,16.04,xenial,12,12.6)
58-
touch build/test_ubuntu_16.04_12
59-
60-
build/test_ubuntu_16.04_13:
61-
$(call test_deb,ubuntu,16.04,xenial,13,13.2)
62-
touch build/test_ubuntu_16.04_13
63-
64-
# UBUNTU 14.04
65-
build/test_ubuntu_14.04_9.6:
66-
$(call test_deb,ubuntu,14.04,trusty,9.6,9.6.21)
67-
touch build/test_ubuntu_14.04_9.6
43+
# UBUNTU 20.04
44+
build/test_ubuntu_20.04_9.6:
45+
$(call test_deb,ubuntu,20.04,focal,9.6,9.6.21)
46+
touch build/test_ubuntu_20.04_9.6
6847

69-
build/test_ubuntu_14.04_10:
70-
$(call test_deb,ubuntu,14.04,trusty,10,10.16)
71-
touch build/test_ubuntu_14.04_10
48+
build/test_ubuntu_20.04_10:
49+
$(call test_deb,ubuntu,20.04,focal,10,10.16)
50+
touch build/test_ubuntu_20.04_10
7251

73-
build/test_ubuntu_14.04_11:
74-
$(call test_deb,ubuntu,14.04,trusty,11,11.11)
75-
touch build/test_ubuntu_14.04_11
52+
build/test_ubuntu_20.04_11:
53+
$(call test_deb,ubuntu,20.04,focal,11,11.11)
54+
touch build/test_ubuntu_20.04_11
7655

77-
build/test_ubuntu_14.04_12:
78-
$(call test_deb,ubuntu,14.04,trusty,12,12.6)
79-
touch build/test_ubuntu_14.04_12
56+
build/test_ubuntu_20.04_12:
57+
$(call test_deb,ubuntu,20.04,focal,12,12.6)
58+
touch build/test_ubuntu_20.04_12
8059

81-
build/test_ubuntu_14.04_13:
82-
$(call test_deb,ubuntu,14.04,trusty,13,13.2)
83-
touch build/test_ubuntu_14.04_13
60+
build/test_ubuntu_20.04_13:
61+
$(call test_deb,ubuntu,20.04,focal,13,13.2)
62+
touch build/test_ubuntu_20.04_13

‎packaging/test/scripts/deb.sh‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,6 @@ PG_TOG=$(echo $PG_VERSION | sed 's|\.||g')
1717
export DEBIAN_FRONTEND=noninteractive
1818
echo'debconf debconf/frontend select Noninteractive'| debconf-set-selections
1919

20-
#if [ ${DISTRIB} == 'ubuntu' ] && [ ${DISTRIB_VERSION} == '14.04' ] && [ ${PG_TOG} == '12' ]; then
21-
# exit 0
22-
#fi
23-
#
24-
#if [ ${DISTRIB} == 'ubuntu' ] && [ ${DISTRIB_VERSION} == '14.04' ] && [ ${PG_TOG} == '13' ]; then
25-
# exit 0
26-
#fi
27-
28-
#if [ ${CODENAME} == 'jessie' ]; then
29-
#printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list
30-
#fi
31-
3220
apt-get -qq update
3321
apt-get -qq install -y wget nginx gnupg lsb-release
3422
#apt-get -qq install -y libterm-readline-gnu-perl dialog gnupg procps

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp