Skip to content

Commit 08bbfce

Browse files
leleliu008leleliu008
committed
optimized
1 parent 0d4ab5d commit 08bbfce

9 files changed

+549
-508
lines changed

‎.github/workflows/centos.yml

+188-188
Large diffs are not rendered by default.

‎.github/workflows/debian.yml

+68-59
Original file line numberDiff line numberDiff line change
@@ -24,89 +24,98 @@ jobs:
2424

2525
- uses: actions/checkout@main
2626

27-
- name: install ppkg
27+
- name: create ppkg formula for uppm package
2828
run: |
29-
curl -LO https://raw.githubusercontent.com/leleliu008/ppkg/master/ppkg
30-
chmod a+x ppkg
31-
./ppkg setup
32-
29+
tee uppm.yml <<EOF
30+
summary: Universal Prebuild Package Manager
31+
src-url: dir://$PWD
32+
license: Apache-2.0
33+
dep-pkg: libcurl libgit2 libarchive libyaml libjansson
34+
install: cmakew -DLINK_STATIC_LIBS=ON
35+
EOF
36+
37+
- run: curl -LO https://raw.githubusercontent.com/leleliu008/ppkg/master/ppkg
38+
- run: chmod a+x ppkg
39+
- run: ./ppkg setup
3340
- run: ./ppkg update
34-
- run: ./ppkg install uppm
41+
- run: ./ppkg install uppm -I .
3542
- run: ./ppkg tree uppm
43+
- run: ./ppkg pack uppm
3644

45+
- run: tar vxf uppm-*-.tar.xz --strip-components=1
3746

38-
- run: echo "SSL_CERT_FILE=$HOME/.ppkg/core/cacert.pem" >> $GITHUB_ENV
47+
- run: echo "SSL_CERT_FILE=$HOME/.ppkg/core/cacert.pem" >> "$GITHUB_ENV"
3948

4049

41-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm
50+
- run: bin/uppm
4251

43-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm --help
44-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm --version
52+
- run: bin/uppm --help
53+
- run: bin/uppm --version
4554

46-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm -h
47-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm -V
55+
- run: bin/uppm -h
56+
- run: bin/uppm -V
4857

49-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm about
50-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm about -v
58+
- run: bin/uppm about
59+
- run: bin/uppm about -v
5160

52-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm integrate zsh
61+
- run: bin/uppm integrate zsh
5362

54-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm update
63+
- run: bin/uppm update
5564

56-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm search zip
65+
- run: bin/uppm search zip
5766

58-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm depends zip
59-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm depends android-sdk
60-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm depends android-sdk -t box
61-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm depends android-sdk -t dot
67+
- run: bin/uppm depends zip
68+
- run: bin/uppm depends android-sdk
69+
- run: bin/uppm depends android-sdk -t box
70+
- run: bin/uppm depends android-sdk -t dot
6271

63-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip
64-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip --json
65-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip --yaml
66-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip version
67-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip license
68-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip summary
69-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip webpage
70-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip bin-url
71-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip bin-sha
72-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip install
73-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip formula
72+
- run: bin/uppm info-available unzip
73+
- run: bin/uppm info-available unzip --json
74+
- run: bin/uppm info-available unzip --yaml
75+
- run: bin/uppm info-available unzip version
76+
- run: bin/uppm info-available unzip license
77+
- run: bin/uppm info-available unzip summary
78+
- run: bin/uppm info-available unzip webpage
79+
- run: bin/uppm info-available unzip bin-url
80+
- run: bin/uppm info-available unzip bin-sha
81+
- run: bin/uppm info-available unzip install
82+
- run: bin/uppm info-available unzip formula
7483

75-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm fetch gzip
76-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm fetch gsed -v
84+
- run: bin/uppm fetch gzip
85+
- run: bin/uppm fetch gsed -v
7786

78-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm install unzip
87+
- run: bin/uppm install unzip
7988

80-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-installed unzip --prefix
81-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-installed unzip --files
82-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-installed unzip --json
83-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-installed unzip --yaml
84-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-installed unzip timestamp-unix
85-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-installed unzip timestamp-iso-8601
86-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-installed unzip timestamp-rfc-3339
87-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-installed unzip version
89+
- run: bin/uppm info-installed unzip --prefix
90+
- run: bin/uppm info-installed unzip --files
91+
- run: bin/uppm info-installed unzip --json
92+
- run: bin/uppm info-installed unzip --yaml
93+
- run: bin/uppm info-installed unzip timestamp-unix
94+
- run: bin/uppm info-installed unzip timestamp-iso-8601
95+
- run: bin/uppm info-installed unzip timestamp-rfc-3339
96+
- run: bin/uppm info-installed unzip version
8897

89-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm tree unzip
90-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm tree unzip -L 3
98+
- run: bin/uppm tree unzip
99+
- run: bin/uppm tree unzip -L 3
91100

92101
- run: |
93-
sed -i '/^version: /c version: 1000' $(~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip formula)
102+
sed -i '/^version: /c version: 1000' $(bin/uppm info-available unzip formula)
94103
95-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm ls-available
96-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm ls-installed
97-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm ls-outdated
104+
- run: bin/uppm ls-available
105+
- run: bin/uppm ls-installed
106+
- run: bin/uppm ls-outdated
98107

99-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm is-available curl
100-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm is-installed unzip
101-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm is-outdated unzip || echo not outdated
108+
- run: bin/uppm is-available curl
109+
- run: bin/uppm is-installed unzip
110+
- run: bin/uppm is-outdated unzip || echo not outdated
102111

103-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm upgrade unzip
104-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm reinstall unzip
105-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm uninstall unzip
112+
- run: bin/uppm upgrade unzip
113+
- run: bin/uppm reinstall unzip
114+
- run: bin/uppm uninstall unzip
106115

107116

108-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm formula-repo-list
109-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm formula-repo-add my_repo https://github.com/leleliu008/uppm-formula-repository-linux-x86_64
110-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm formula-repo-del my_repo
117+
- run: bin/uppm formula-repo-list
118+
- run: bin/uppm formula-repo-add my_repo https://github.com/leleliu008/uppm-formula-repository-linux-x86_64
119+
- run: bin/uppm formula-repo-del my_repo
111120

112-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm cleanup
121+
- run: bin/uppm cleanup

‎.github/workflows/linuxmint.yml

+68-61
Original file line numberDiff line numberDiff line change
@@ -24,90 +24,97 @@ jobs:
2424

2525
- uses: actions/checkout@main
2626

27-
- name: install ppkg
27+
- name: create ppkg formula for uppm package
2828
run: |
29-
curl -LO https://raw.githubusercontent.com/leleliu008/ppkg/master/ppkg
30-
chmod a+x ppkg
31-
./ppkg setup
32-
29+
tee uppm.yml <<EOF
30+
summary: Universal Prebuild Package Manager
31+
src-url: dir://$PWD
32+
license: Apache-2.0
33+
dep-pkg: libcurl libgit2 libarchive libyaml libjansson
34+
install: cmakew -DLINK_STATIC_LIBS=ON
35+
EOF
36+
37+
- run: curl -LO https://raw.githubusercontent.com/leleliu008/ppkg/master/ppkg
38+
- run: chmod a+x ppkg
39+
- run: ./ppkg setup
3340
- run: ./ppkg update
34-
- run: ./ppkg install uppm
41+
- run: ./ppkg install uppm -I .
3542
- run: ./ppkg tree uppm
43+
- run: ./ppkg pack uppm
3644

45+
- run: tar vxf uppm-*-.tar.xz --strip-components=1
3746

47+
- run: echo "SSL_CERT_FILE=$HOME/.ppkg/core/cacert.pem" >> "$GITHUB_ENV"
3848

39-
- run: echo "SSL_CERT_FILE=$HOME/.ppkg/core/cacert.pem" >> $GITHUB_ENV
40-
41-
42-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm
49+
- run: bin/uppm
4350

44-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm --help
45-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm --version
51+
- run: bin/uppm --help
52+
- run: bin/uppm --version
4653

47-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm -h
48-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm -V
54+
- run: bin/uppm -h
55+
- run: bin/uppm -V
4956

50-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm about
51-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm about -v
57+
- run: bin/uppm about
58+
- run: bin/uppm about -v
5259

53-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm integrate zsh
60+
- run: bin/uppm integrate zsh
5461

55-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm update
62+
- run: bin/uppm update
5663

57-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm search zip
64+
- run: bin/uppm search zip
5865

59-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm depends zip
60-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm depends android-sdk
61-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm depends android-sdk -t box
62-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm depends android-sdk -t dot
66+
- run: bin/uppm depends zip
67+
- run: bin/uppm depends android-sdk
68+
- run: bin/uppm depends android-sdk -t box
69+
- run: bin/uppm depends android-sdk -t dot
6370

64-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip
65-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip --json
66-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip --yaml
67-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip version
68-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip license
69-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip summary
70-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip webpage
71-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip bin-url
72-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip bin-sha
73-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip install
74-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip formula
71+
- run: bin/uppm info-available unzip
72+
- run: bin/uppm info-available unzip --json
73+
- run: bin/uppm info-available unzip --yaml
74+
- run: bin/uppm info-available unzip version
75+
- run: bin/uppm info-available unzip license
76+
- run: bin/uppm info-available unzip summary
77+
- run: bin/uppm info-available unzip webpage
78+
- run: bin/uppm info-available unzip bin-url
79+
- run: bin/uppm info-available unzip bin-sha
80+
- run: bin/uppm info-available unzip install
81+
- run: bin/uppm info-available unzip formula
7582

76-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm fetch gzip
77-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm fetch gsed -v
83+
- run: bin/uppm fetch gzip
84+
- run: bin/uppm fetch gsed -v
7885

79-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm install unzip
86+
- run: bin/uppm install unzip
8087

81-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-installed unzip --prefix
82-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-installed unzip --files
83-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-installed unzip --json
84-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-installed unzip --yaml
85-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-installed unzip timestamp-unix
86-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-installed unzip timestamp-iso-8601
87-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-installed unzip timestamp-rfc-3339
88-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-installed unzip version
88+
- run: bin/uppm info-installed unzip --prefix
89+
- run: bin/uppm info-installed unzip --files
90+
- run: bin/uppm info-installed unzip --json
91+
- run: bin/uppm info-installed unzip --yaml
92+
- run: bin/uppm info-installed unzip timestamp-unix
93+
- run: bin/uppm info-installed unzip timestamp-iso-8601
94+
- run: bin/uppm info-installed unzip timestamp-rfc-3339
95+
- run: bin/uppm info-installed unzip version
8996

90-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm tree unzip
91-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm tree unzip -L 3
97+
- run: bin/uppm tree unzip
98+
- run: bin/uppm tree unzip -L 3
9299

93100
- run: |
94-
sed -i '/^version: /c version: 1000' $(~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm info-available unzip formula)
101+
sed -i '/^version: /c version: 1000' $(bin/uppm info-available unzip formula)
95102
96-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm ls-available
97-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm ls-installed
98-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm ls-outdated
103+
- run: bin/uppm ls-available
104+
- run: bin/uppm ls-installed
105+
- run: bin/uppm ls-outdated
99106

100-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm is-available curl
101-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm is-installed unzip
102-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm is-outdated unzip || echo not outdated
107+
- run: bin/uppm is-available curl
108+
- run: bin/uppm is-installed unzip
109+
- run: bin/uppm is-outdated unzip || echo not outdated
103110

104-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm upgrade unzip
105-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm reinstall unzip
106-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm uninstall unzip
111+
- run: bin/uppm upgrade unzip
112+
- run: bin/uppm reinstall unzip
113+
- run: bin/uppm uninstall unzip
107114

108115

109-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm formula-repo-list
110-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm formula-repo-add my_repo https://github.com/leleliu008/uppm-formula-repository-linux-x86_64
111-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm formula-repo-del my_repo
116+
- run: bin/uppm formula-repo-list
117+
- run: bin/uppm formula-repo-add my_repo https://github.com/leleliu008/uppm-formula-repository-linux-x86_64
118+
- run: bin/uppm formula-repo-del my_repo
112119

113-
- run: ~/.ppkg/installed/linux-glibc-x86_64/uppm/bin/uppm cleanup
120+
- run: bin/uppm cleanup

‎.github/workflows/macos-brew.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
depends_on "libarchive"
3939
4040
def install
41-
system "cmake", "-S", ".", "-B", "build", "-DCMAKE_BUILD_TYPE=Release", "-DCMAKE_VERBOSE_MAKEFILE=ON"
41+
system "cmake", "-S", ".", "-B", "build", *std_cmake_args, "-DCMAKE_BUILD_TYPE=Release", "-DCMAKE_VERBOSE_MAKEFILE=ON"
4242
system "cmake", "--build", "build"
4343
system "cmake", "--install", "build"
4444
end
@@ -162,7 +162,7 @@ jobs:
162162
depends_on "libarchive"
163163
164164
def install
165-
system "cmake", "-S", ".", "-B", "build", "-DCMAKE_BUILD_TYPE=Debug", "-DCMAKE_VERBOSE_MAKEFILE=ON", "-DCMAKE_C_FLAGS='-fsanitize=undefined -fsanitize=address -fsanitize=leak'", "-DCMAKE_C_COMPILER=#{Formula["llvm"].opt_prefix}/bin/clang"
165+
system "cmake", "-S", ".", "-B", "build", *std_cmake_args, "-DCMAKE_BUILD_TYPE=Debug", "-DCMAKE_VERBOSE_MAKEFILE=ON", "-DCMAKE_C_FLAGS='-fsanitize=undefined -fsanitize=address -fsanitize=leak'", "-DCMAKE_C_COMPILER=#{Formula["llvm"].opt_prefix}/bin/clang"
166166
system "cmake", "--build", "build"
167167
system "cmake", "--install", "build"
168168
end

0 commit comments

Comments
 (0)