Skip to content

Commit cb35d95

Browse files
igagisigagis
committed
deploy to own repo
1 parent 839f6c5 commit cb35d95

File tree

12 files changed

+87
-85
lines changed

12 files changed

+87
-85
lines changed

‎.github/workflows/ci.yml

Lines changed: 62 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
name: ci
2-
on: [push, pull_request]
2+
on:
3+
push: {branches-ignore: [latest], tags: ['*']}
4+
pull_request:
35
env:
46
PACKAGE_NAME: ${{ github.event.repository.name }}
57
PACKAGE_VERSION: ${{ github.sha }}
6-
MYCI_JFROG_USERNAME: [email protected]
7-
MYCI_JFROG_PASSWORD: ${{ secrets.MYCI_JFROG_PASSWORD }}
8+
MYCI_NEXUS_USERNAME: cppfw
9+
MYCI_NEXUS_PASSWORD: ${{ secrets.MYCI_NEXUS_PASSWORD }}
810
MYCI_GIT_USERNAME: igagis
911
MYCI_GIT_PASSWORD: ${{ secrets.MYCI_GIT_ACCESS_TOKEN }}
10-
CONAN_REMOTE: https://cppfw.jfrog.io/artifactory/api/conan/conan
12+
MYCI_CONAN_REMOTE: http://gagis.hopto.org/conan
13+
MYCI_CONAN_USER: cppfw
14+
MYCI_CONAN_PASSWORD: ${{ secrets.MYCI_CONAN_PASSWORD }}
1115
CONAN_V2_MODE: 1
1216
CONAN_REVISIONS_ENABLED: 1
17+
CONAN_SCM_TO_CONANDATA: 1
1318
jobs:
1419
##### linux #####
1520
linux:
@@ -19,28 +24,28 @@ jobs:
1924
include:
2025
- {os: debian, codename: buster, image_owner: , package_type: deb}
2126
- {os: debian, codename: buster, image_owner: i386/, package_type: deb, labels: [i386,docker]}
22-
# - {os: ubuntu, codename: bionic, image_owner: , package_type: deb}
27+
- {os: debian, codename: buster, image_owner: arm32v7/, package_type: deb, labels: [arm,docker]}
2328
- {os: ubuntu, codename: focal, image_owner: , package_type: deb}
2429
- {os: raspbian, codename: buster, image_owner: igagis/, package_type: deb, labels: [arm,docker]}
2530
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
2631
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
2732
name: linux - ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
2833
steps:
29-
- name: git clone
30-
uses: actions/checkout@v1
3134
- name: add cppfw deb repo
3235
uses: myci-actions/add-deb-repo@master
3336
with:
34-
repo: deb https://cppfw.jfrog.io/artifactory/${{ matrix.os }} ${{ matrix.codename }} main
37+
repo: deb http://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
3538
repo-name: cppfw
36-
key-server: https://cppfw.jfrog.io/artifactory/api/gpg/key/public
37-
keys: 4A949240F79AD8027C6CA2F4953AE777616ADEDF
39+
key-server: http://gagis.hopto.org/repo/cppfw/pubkey.gpg
40+
install: myci git locales
3841
- name: install ci tools
3942
run: |
4043
# configure timezone to avoid 'tzdata' package to require user interaction during installation (needed for ubuntu:focal)
4144
TZ=Europe/Helsinki ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
4245
43-
apt install --assume-yes devscripts equivs myci locales
46+
apt install --assume-yes devscripts equivs
47+
- name: git clone
48+
uses: myci-actions/checkout@master
4449
- name: set PACKAGE_VERSION
4550
uses: myci-actions/export-env-var@master
4651
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
@@ -64,14 +69,16 @@ jobs:
6469
fail_on_failure: true
6570
if: ${{ matrix.labels == '' }}
6671
- name: deploy deb packages
67-
run: myci-deploy-debian-jfrog.sh --domain cppfw --repo ${{ matrix.os }} --distro ${{ matrix.codename }} --component main ../lib${PACKAGE_NAME}*_${PACKAGE_VERSION}_*.deb
72+
run: |
73+
echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
74+
myci-deploy-debian-ssh-freight.sh --key repo_key_rsa --server gagis.hopto.org --repo cppfw/${{ matrix.os }} --distro ${{ matrix.codename }} --component main ../lib${PACKAGE_NAME}*_${PACKAGE_VERSION}_*.deb
6875
if: matrix.package_type == 'deb' && startsWith(github.ref, 'refs/tags/')
6976
##### macosx #####
7077
macosx:
7178
runs-on: macos-latest
7279
steps:
7380
- name: git clone
74-
uses: actions/checkout@v2
81+
uses: myci-actions/checkout@master
7582
- name: add cppfw tap
7683
run: |
7784
brew tap cppfw/tap
@@ -105,7 +112,7 @@ jobs:
105112
- name: install ci tools
106113
run: brew install myci
107114
- name: git clone
108-
uses: actions/checkout@v2
115+
uses: myci-actions/checkout@master
109116
- name: set PACKAGE_VERSION
110117
uses: myci-actions/export-env-var@master
111118
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
@@ -124,24 +131,24 @@ jobs:
124131
- name: create package
125132
run: myci-create-zip-package.sh --headers-dir src --file xcode/build/lib$PACKAGE_NAME.a///lib/ios --file LICENSE $PACKAGE_NAME-$PACKAGE_VERSION.zip
126133
- name: deploy
127-
run: myci-deploy-cocoapods-jfrog.sh --repo cppfw --version $PACKAGE_VERSION --domain cppfw --jfrog-repo cocoapods --package-file $PACKAGE_NAME-$PACKAGE_VERSION.zip cocoapods/$PACKAGE_NAME.podspec.in
134+
run: |
135+
echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
136+
myci-deploy-cocoapods-ssh.sh --repo cppfw --version $PACKAGE_VERSION --server gagis.hopto.org --key repo_key_rsa --generic-repo cppfw/cocoapods --package $PACKAGE_NAME-$PACKAGE_VERSION.zip cocoapods/$PACKAGE_NAME.podspec.in
128137
if: startsWith(github.ref, 'refs/tags/')
129138
##### android #####
130139
android:
131140
runs-on: ubuntu-latest
132141
container: mingc/android-build-box:latest
133142
steps:
134143
- name: git clone
135-
uses: actions/checkout@v2
144+
uses: myci-actions/checkout@master
136145
- name: add cppfw deb repo
137146
uses: myci-actions/add-deb-repo@master
138147
with:
139-
repo: deb https://cppfw.jfrog.io/artifactory/$(lsb_release --id --short | tr '[:upper:]' '[:lower:]') $(lsb_release --codename --short) main
148+
repo: deb http://gagis.hopto.org/repo/cppfw/$(lsb_release --id --short | tr '[:upper:]' '[:lower:]') $(lsb_release --codename --short) main
140149
repo-name: cppfw
141-
key-server: https://cppfw.jfrog.io/artifactory/api/gpg/key/public
142-
keys: 4A949240F79AD8027C6CA2F4953AE777616ADEDF
143-
- name: install ci tools
144-
run: apt install --assume-yes myci
150+
key-server: http://gagis.hopto.org/repo/cppfw/pubkey.gpg
151+
install: myci
145152
- name: set PACKAGE_VERSION
146153
uses: myci-actions/export-env-var@master
147154
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
@@ -152,7 +159,7 @@ jobs:
152159
myci-apply-version.sh -v $PACKAGE_VERSION *.pom.in
153160
myci-apply-version.sh -v $PACKAGE_VERSION *.aar.in --filename-only
154161
- name: deploy
155-
run: myci-deploy-maven-jfrog.sh --domain cppfw --repo android --path io/github/cppfw/$PACKAGE_NAME/$PACKAGE_VERSION android/$PACKAGE_NAME-$PACKAGE_VERSION.aar
162+
run: myci-deploy-maven-nexus.sh --base-url http://gagis.hopto.org/nexus --repo android android/$PACKAGE_NAME-$PACKAGE_VERSION.aar
156163
if: startsWith(github.ref, 'refs/tags/')
157164
##### msys2 #####
158165
msys2:
@@ -176,16 +183,23 @@ jobs:
176183
install: >-
177184
msys2-devel
178185
mingw-w64-${{ matrix.arch }}-toolchain
179-
- name: git clone
180-
uses: actions/checkout@v2
181186
- name: add cppfw pacman msys repo
182187
uses: myci-actions/add-pacman-repo@master
183-
with: {name: cppfw_msys, url: 'https://cppfw.jfrog.io/artifactory/msys2/msys', shell: 'msys2 {0}'}
184-
- name: add cppfw pacman ${{ matrix.repo }} repo
188+
with:
189+
name: cppfw_msys
190+
url: http://gagis.hopto.org/repo/cppfw/msys2/msys
191+
shell: 'msys2 {0}'
192+
key-server: http://gagis.hopto.org/repo/cppfw/pubkey.gpg
193+
install: myci
194+
- name: add cppfw pacman msys/mingw repo
185195
uses: myci-actions/add-pacman-repo@master
186-
with: {name: 'cppfw_${{ matrix.repo }}', url: 'https://cppfw.jfrog.io/artifactory/msys2/${{ matrix.repo }}', shell: 'msys2 {0}'}
187-
- name: install ci tools
188-
run: pacman -Sy --noconfirm myci
196+
with:
197+
name: cppfw_${{ matrix.repo }}
198+
url: http://gagis.hopto.org/repo/cppfw/msys2/${{ matrix.repo }}
199+
shell: 'msys2 {0}'
200+
key-server: http://gagis.hopto.org/repo/cppfw/pubkey.gpg
201+
- name: git clone
202+
uses: myci-actions/checkout@master
189203
- name: prepare pacman package
190204
run: myci-apply-version.sh -v $(myci-deb-version.sh debian/changelog) msys2/PKGBUILD.in
191205
- name: build
@@ -203,8 +217,9 @@ jobs:
203217
fail_on_failure: true
204218
- name: deploy
205219
run: |
220+
echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
206221
for f in $(find msys2 -name "mingw-w64-${{ matrix.arch }}-$PACKAGE_NAME-*-any.pkg.*"); do
207-
myci-deploy-pacman-jfrog.sh --domain cppfw --repo msys2 --path ${{ matrix.repo }} --database cppfw_${{ matrix.repo }} $f
222+
myci-deploy-pacman-ssh.sh --server gagis.hopto.org --key repo_key_rsa --repo cppfw/msys2/${{ matrix.repo }} --database cppfw_${{ matrix.repo }} $f
208223
done
209224
if: startsWith(github.ref, 'refs/tags/')
210225
##### msvs #####
@@ -240,28 +255,27 @@ jobs:
240255
include:
241256
- {os: debian, codename: buster, image_owner: , arch: x86_64}
242257
# - {os: debian, codename: buster, image_owner: i386/, arch: x86, labels: [i386,docker]}
243-
# - {os: raspbian, codename: buster, image_owner: igagis/, arch: armhf, labels: [arm,docker]}
258+
# - {os: debian, codename: buster, image_owner: arm32v7/, arch: armhf, labels: [arm,docker]}
244259
runs-on: ${{ (matrix.labels == '' && 'ubuntu-latest') || matrix.labels }}
245260
container: ${{ matrix.image_owner }}${{ matrix.os }}:${{ matrix.codename }}
246261
name: conan - linux - ${{ matrix.arch }}
247262
steps:
248-
- name: git clone
249-
uses: actions/checkout@v1
263+
- name: clean
264+
uses: myci-actions/clean@master
250265
- name: add cppfw deb repo
251266
uses: myci-actions/add-deb-repo@master
252267
with:
253-
repo: deb https://cppfw.jfrog.io/artifactory/${{ matrix.os }} ${{ matrix.codename }} main
268+
repo: deb http://gagis.hopto.org/repo/cppfw/${{ matrix.os }} ${{ matrix.codename }} main
254269
repo-name: cppfw
255-
key-server: https://cppfw.jfrog.io/artifactory/api/gpg/key/public
256-
keys: 4A949240F79AD8027C6CA2F4953AE777616ADEDF
257-
- name: install ci tools
258-
run: |
259-
apt install --assume-yes devscripts equivs myci prorab prorab-extra python3-pip cmake
270+
key-server: http://gagis.hopto.org/repo/cppfw/pubkey.gpg
271+
install: devscripts equivs myci prorab prorab-extra python3-pip cmake git
260272
- name: install conan
261273
run: |
262274
pip3 install conan
263275
conan profile new --detect default
264276
conan profile update settings.compiler.libcxx=libstdc++11 default
277+
- name: git clone
278+
uses: myci-actions/checkout@master
265279
- name: set PACKAGE_VERSION
266280
uses: myci-actions/export-env-var@master
267281
with: {name: PACKAGE_VERSION, value: $(myci-deb-version.sh debian/changelog)}
@@ -270,20 +284,20 @@ jobs:
270284
run: myci-apply-version.sh -v $PACKAGE_VERSION conan/conanfile.py.in
271285
- name: build
272286
run: |
273-
conan remote add cppfw $CONAN_REMOTE
274-
conan create conan
287+
conan remote add cppfw $MYCI_CONAN_REMOTE
288+
conan create conan $MYCI_CONAN_USER/main --ignore-dirty
275289
- name: deploy conan package
276290
run: |
277-
conan user --remote cppfw --password $MYCI_JFROG_PASSWORD $MYCI_JFROG_USERNAME
278-
conan upload --remote cppfw --all $PACKAGE_NAME/$PACKAGE_VERSION@
291+
conan user --remote cppfw --password $MYCI_CONAN_PASSWORD $MYCI_CONAN_USER
292+
conan upload --remote cppfw --all $PACKAGE_NAME/$PACKAGE_VERSION@$MYCI_CONAN_USER/main
279293
if: startsWith(github.ref, 'refs/tags/')
280294
##### conan - macosx #####
281295
conan-macosx:
282296
name: conan - macosx
283297
runs-on: macos-latest
284298
steps:
285299
- name: git clone
286-
uses: actions/checkout@v2
300+
uses: myci-actions/checkout@master
287301
- name: add cppfw tap
288302
run: |
289303
brew tap cppfw/tap
@@ -301,10 +315,10 @@ jobs:
301315
run: myci-apply-version.sh -v $PACKAGE_VERSION conan/conanfile.py.in
302316
- name: build
303317
run: |
304-
conan remote add cppfw $CONAN_REMOTE
305-
conan create conan
318+
conan remote add cppfw $MYCI_CONAN_REMOTE
319+
conan create conan $MYCI_CONAN_USER/main --ignore-dirty
306320
- name: deploy conan package
307321
run: |
308-
conan user --remote cppfw --password $MYCI_JFROG_PASSWORD $MYCI_JFROG_USERNAME
309-
conan upload --remote cppfw --all $PACKAGE_NAME/$PACKAGE_VERSION@
322+
conan user --remote cppfw --password $MYCI_CONAN_PASSWORD $MYCI_CONAN_USER
323+
conan upload --remote cppfw --all $PACKAGE_NAME/$PACKAGE_VERSION@$MYCI_CONAN_USER/main
310324
if: startsWith(github.ref, 'refs/tags/')

‎.gitignore

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1 @@
1-
debian/
2-
3-
#*.[aod]
4-
obj_*/
5-
*.a
6-
*.so
7-
*.so.*
8-
*.dylib
9-
10-
doc/doxygen/
11-
doc/doxygen.cfg
12-
13-
nbproject/
14-
1+
**/out/*

‎android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ android {
4040

4141
repositories {
4242
maven {
43-
url 'https://cppfw.jfrog.io/artifactory/android/'
43+
url 'http://gagis.hopto.org/nexus/repository/android/'
4444
}
4545
}
4646
dependencies {

‎android/svgdom/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ android {
4646

4747
repositories {
4848
maven {
49-
url 'https://cppfw.jfrog.io/artifactory/android/'
49+
url 'http://gagis.hopto.org/nexus/repository/android/'
5050
}
5151
}
5252
dependencies {

‎cocoapods/svgdom.podspec.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Pod::Spec.new do |s|
88
s.platform = :ios
99
s.ios.deployment_target = '8.0'
1010

11-
s.source = { :http => "https://cppfw.jfrog.io/artifactory/cocoapods/#{s.name}-#{s.version}.zip" }
11+
s.source = { :http => "http://gagis.hopto.org/repo/cppfw/cocoapods/#{s.name}-#{s.version}.zip" }
1212

1313
s.source_files = "include/**/*.{hpp,h}"
1414
s.header_mappings_dir = "include"

‎conan/conanfile.py.in

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,18 @@ class SvgdomConan(ConanFile):
1111
settings = "os", "compiler", "build_type", "arch"
1212
options = {"shared": [True, False], "fPIC": [True, False]}
1313
default_options = {"shared": False, "fPIC": True}
14-
requires = "utki/[>=0.0.150]", "mikroxml/[>=0.0.0]", "cssom/[>=0.0.0]", "r4/[>=0.0.0]", "tst/[>=0.0.0]"
14+
requires = "utki/[>=0.0.150]@cppfw/main", "mikroxml/[>=0.0.0]@cppfw/main", "cssom/[>=0.0.0]@cppfw/main", "r4/[>=0.0.0]@cppfw/main", "tst/[>=0.0.0]@cppfw/main"
1515
generators = "make"
16+
scm = {"type": "git", "url": "auto", "revision": "auto"}
1617

1718
def config_options(self):
1819
if self.settings.os == "Windows":
1920
del self.options.fPIC
2021

21-
def source(self):
22-
self.run("git clone https://github.com/cppfw/" + self.name + ".git")
23-
self.run("cd " + self.name + " && git checkout " + self.version)
22+
# we use the 'scm' attribute, so the source() method is not needed
23+
# def source(self):
24+
# self.run("git clone https://github.com/cppfw/" + self.name + ".git")
25+
# self.run("cd " + self.name + " && git checkout " + self.version)
2426

2527
# This small hack might be useful to guarantee proper /MT /MD linkage
2628
# in MSVC if the packaged project doesn't have variables to set it
@@ -31,18 +33,18 @@ class SvgdomConan(ConanFile):
3133
# conan_basic_setup()''')
3234

3335
def build(self):
34-
self.run("CONANBUILDINFO_DIR=$(pwd)/ make --directory " + self.name + " autojobs=true")
35-
self.run("CONANBUILDINFO_DIR=$(pwd)/ make --directory " + self.name + " autojobs=true test")
36+
self.run("CONANBUILDINFO_DIR=$(pwd)/ make autojobs=true")
37+
self.run("CONANBUILDINFO_DIR=$(pwd)/ make autojobs=true test")
3638

3739
def package(self):
38-
self.copy("*.h", dst="include", src=self.name + "/src")
39-
self.copy("*.hpp", dst="include", src=self.name + "/src")
40+
self.copy("*.h", dst="include", src="src")
41+
self.copy("*.hpp", dst="include", src="src")
4042
self.copy("*" + self.name + ".lib", dst="lib", keep_path=False)
41-
self.copy("*.dll", dst="bin", src=self.name + "/src/out/rel", keep_path=False)
42-
self.copy("*.so", dst="lib", src=self.name + "/src/out/rel", keep_path=False)
43-
self.copy("*.so.*", dst="lib", src=self.name + "/src/out/rel", keep_path=False)
44-
self.copy("*.dylib", dst="lib", src=self.name + "/src/out/rel", keep_path=False)
45-
self.copy("*.a", dst="lib", src=self.name + "/src/out/rel", keep_path=False)
43+
self.copy("*.dll", dst="bin", src= "src/out/rel", keep_path=False)
44+
self.copy("*.so", dst="lib", src= "src/out/rel", keep_path=False)
45+
self.copy("*.so.*", dst="lib", src= "src/out/rel", keep_path=False)
46+
self.copy("*.dylib", dst="lib", src="src/out/rel", keep_path=False)
47+
self.copy("*.a", dst="lib", src= "src/out/rel", keep_path=False)
4648

4749
def package_info(self):
4850
self.cpp_info.libs = [self.name]

‎doc/doxygen.cfg.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,7 +737,7 @@ WARN_LOGFILE =
737737
# spaces.
738738
# Note: If this tag is empty the current directory is searched.
739739

740-
INPUT = ../src/
740+
INPUT = ../../src/
741741

742742
# This tag can be used to specify the character encoding of the source files
743743
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

‎doc/makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
include prorab.mk
22
include prorab-doxygen.mk
33

4+
this_out_dir := out
45
this_name := svgdom
56

67
$(eval $(prorab-build-doxygen))

‎makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
include prorab.mk
22

3-
$(eval $(prorab-build-subdirs))
3+
$(eval $(prorab-include-subdirs))

‎src/makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
include prorab.mk
2-
include myci.mk
32

4-
$(eval $(call myci-try-include, $(CONANBUILDINFO_DIR)conanbuildinfo.mak))
3+
$(eval $(call prorab-try-simple-include, $(CONANBUILDINFO_DIR)conanbuildinfo.mak))
54

65
$(eval $(call prorab-config, ../config))
76

‎tests/makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
include prorab.mk
22

3-
$(eval $(prorab-build-subdirs))
3+
$(eval $(prorab-include-subdirs))

‎tests/unit/makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
include prorab.mk
22
include prorab-test.mk
3-
include myci.mk
43

5-
$(eval $(call myci-try-include, $(CONANBUILDINFO_DIR)conanbuildinfo.mak))
4+
$(eval $(call prorab-try-simple-include, $(CONANBUILDINFO_DIR)conanbuildinfo.mak))
65

76
$(eval $(call prorab-config, ../../config))
87

0 commit comments

Comments
 (0)