Skip to content

Commit 301ece3

Browse files
blucabluca
committed
Problem: out of date with zproject
Solution: regenerate
1 parent 16ec33c commit 301ece3

File tree

9 files changed

+151
-32
lines changed

9 files changed

+151
-32
lines changed

‎.github/workflows/CI.yaml

+93
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
# Github Actions CI script
2+
# This is a skeleton created by zproject.
3+
# You can add hand-written code here.
4+
5+
name: CI
6+
on:
7+
push:
8+
pull_request:
9+
10+
11+
jobs:
12+
build:
13+
runs-on: ${{ matrix.os }}
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
include:
18+
- os: ubuntu-latest
19+
BUILD_TYPE: default
20+
DRAFT: enabled
21+
CLANG_FORMAT: clang-format-11
22+
PACKAGES: automake autoconf clang-format-11 git libzmq3-dev libczmq-dev libzyre-dev asciidoc xmlto
23+
- os: ubuntu-latest
24+
BUILD_TYPE: default
25+
DRAFT: disabled
26+
CLANG_FORMAT: clang-format-11
27+
PACKAGES: automake autoconf clang-format-11 git libzmq3-dev libczmq-dev libzyre-dev
28+
- os: ubuntu-latest
29+
BUILD_TYPE: valgrind
30+
DRAFT: enabled
31+
PACKAGES: automake autoconf valgrind git libzmq3-dev libczmq-dev libzyre-dev
32+
- os: ubuntu-latest
33+
BUILD_TYPE: cmake
34+
DRAFT: enabled
35+
PACKAGES: cmake git libzmq3-dev libczmq-dev libzyre-dev
36+
- os: macos-latest
37+
BUILD_TYPE: default
38+
PACKAGES: automake autoconf zeromq
39+
DRAFT: enabled
40+
- os: macos-latest
41+
BUILD_TYPE: default
42+
DRAFT: disabled
43+
PACKAGES: automake autoconf zeromq
44+
# For non-cmake users, there is an autotools solution with a bit more overhead
45+
# to have dependencies ready and pass configure script before making this check).
46+
# Note that the autotools variant will also require dependencies preinstalled to
47+
# pass its configure script:
48+
- os: ubuntu-latest
49+
BUILD_TYPE: cmake
50+
DO_CLANG_FORMAT_CHECK: 1
51+
CLANG_FORMAT: clang-format-11
52+
PACKAGES: cmake clang-format-11 git libzmq3-dev libczmq-dev libzyre-dev
53+
env:
54+
# Set CI_TIME: true to enable build-step profiling
55+
# Set CI_TRACE: true to enable shell script tracing
56+
# Set CI_CONFIG_QUIET: true to enable "configure --quiet" (only report stderr)
57+
# Set CI_REQUIRE_GOOD_GITIGNORE: false to NOT fail if "git status -s" is not clean
58+
# Set CI_REQUIRE_GOOD_CLANG_FORMAT: true to fail if "clang-format" check is not clean
59+
CI_TIME: false
60+
CI_TRACE: false
61+
CI_CONFIG_QUIET: true
62+
CI_REQUIRE_GOOD_GITIGNORE: false
63+
CI_REQUIRE_GOOD_CLANG_FORMAT: false
64+
CI_TEST_DISTCHECK: true
65+
platform: ${{ matrix.platform }}
66+
configuration: ${{ matrix.configuration }}
67+
ENABLE_DRAFTS: ${{ matrix.ENABLE_DRAFTS }}
68+
BUILD_TYPE: ${{ matrix.BUILD_TYPE }}
69+
DRAFT: ${{ matrix.DRAFT }}
70+
DO_CLANG_FORMAT_CHECK: ${{ matrix.DO_CLANG_FORMAT_CHECK }}
71+
CLANG_FORMAT: ${{ matrix.CLANG_FORMAT }}
72+
CI_SELFTEST: ${{ matrix.CI_SELFTEST }}
73+
steps:
74+
- name: Add debian packages
75+
if: matrix.os == 'ubuntu-latest'
76+
uses: myci-actions/add-deb-repo@10
77+
with:
78+
repo-name: obs
79+
repo: deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_20.04/ ./
80+
keys-asc: https://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_20.04/Release.key
81+
install: ${{ matrix.PACKAGES }}
82+
- name: Add brew packages
83+
if: matrix.os == 'macos-latest'
84+
shell: bash
85+
run: brew install ${{ matrix.PACKAGES }}
86+
- uses: actions/checkout@v2
87+
with:
88+
path: glar150
89+
- name: build
90+
if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
91+
shell: bash
92+
working-directory: glar150
93+
run: ./ci_build.sh

‎.obs/workflows.yml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
pull_request:
2+
steps:
3+
- branch_package:
4+
source_project: network:messaging:zeromq:git-draft
5+
source_package: glar150
6+
target_project: network:messaging:zeromq:ci
7+
filters:
8+
event: pull_request
9+
merge:
10+
steps:
11+
- trigger_services:
12+
project: network:messaging:zeromq:git-stable
13+
package: glar150
14+
filters:
15+
event: push
16+
branches:
17+
only:
18+
- master
19+
release:
20+
steps:
21+
- trigger_services:
22+
project: network:messaging:zeromq:release-stable
23+
package: glar150
24+
- trigger_services:
25+
project: network:messaging:zeromq:release-draft
26+
package: glar150
27+
filters:
28+
event: tag_push

‎ci_build.sh

+7-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ fold_end() {
4949
case $TRAVIS_OS_NAME in
5050
windows)
5151
export
52-
choco install openjdk
52+
choco install openjdk13
5353
export JAVA_HOME="C:\Program Files\OpenJDK\jdk-13.0.2"
5454
export BUILD_PREFIX=$TEMP/ci_build
5555
# Build will fail if processes are still running at the end of the script.
@@ -217,6 +217,11 @@ default|default-Werror|default-with-docs|valgrind|clang-format-check)
217217
if [ -z "${CI_CONFIG_QUIET-}" ] || [ "${CI_CONFIG_QUIET-}" = yes ] || [ "${CI_CONFIG_QUIET-}" = true ]; then
218218
CONFIG_OPTS+=("--quiet")
219219
fi
220+
if [ -z "${CI_SELFTEST-}" ] || [ "${CI_SELFTEST-}" = yes ] || [ "${CI_SELFTEST-}" = true ]; then
221+
CONFIG_OPTS+=("--enable-glar150_selftest")
222+
else
223+
CONFIG_OPTS+=("--disable-glar150_selftest")
224+
fi
220225

221226
if [ "$HAVE_CCACHE" = yes ] && [ "${COMPILER_FAMILY}" = GCC ]; then
222227
PATH="/usr/lib/ccache:$PATH"
@@ -278,7 +283,7 @@ default|default-Werror|default-with-docs|valgrind|clang-format-check)
278283
# Start of recipe for dependency: libzmq
279284
fold_start dependency.libzmq "Install dependency libzmq"
280285
if ! ((command -v dpkg >/dev/null 2>&1 && dpkg -s libzmq3-dev >/dev/null 2>&1) || \
281-
(command -v brew >/dev/null 2>&1 && brew ls --versions libzmq >/dev/null 2>&1)) \
286+
(command -v brew >/dev/null 2>&1 && brew ls --versions zeromq >/dev/null 2>&1)) \
282287
; then
283288
echo ""
284289
BASE_PWD=${PWD}

‎packaging/debian/control

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ Build-Depends: debhelper (>= 9),
1919
libczmq-dev,
2020
libzyre-dev,
2121
systemd,
22-
dh-systemd,
2322
asciidoc-base | asciidoc, xmlto,
2423
dh-autoreconf
2524

‎packaging/debian/glar150.dsc.obs ‎packaging/debian/glar150.dsc

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Build-Depends: debhelper (>= 9),
1010
libczmq-dev,
1111
libzyre-dev,
1212
systemd,
13-
dh-systemd,
1413
asciidoc-base | asciidoc, xmlto,
1514
dh-autoreconf
1615

‎packaging/debian/rules

-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ ifneq (,$(findstring nodoc,$(DEB_BUILD_PROFILES)))
3030
DOCS=no
3131
endif
3232

33-
# Workaround for automake < 1.14 bug
34-
$(shell dpkg --compare-versions `dpkg-query -W -f='$${Version}\n' automake` lt 1:1.14 && mkdir -p config)
3533
$(shell test -f src/Makemodule-local.am || touch src/Makemodule-local.am)
3634

3735
override_dh_strip:

‎packaging/obs/_service

+18-26
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<services>
2-
<service name="tar_scm">
2+
<service name="obs_scm">
33
<param name="url">https://github.com/zmqers/glar150</param>
44
<param name="scm">git</param>
55
<!-- delete to build from latest master on each refresh -->
@@ -11,82 +11,74 @@
1111
<param name="exclude">.git</param>
1212
<param name="changesgenerate">enable</param>
1313
<param name="filename">glar150</param>
14+
<param name="extract">packaging/debian/glar150.dsc</param>
15+
<param name="extract">packaging/redhat/glar150.spec</param>
1416
</service>
1517

16-
<!-- extract redhat packaging -->
17-
<service name="extract_file">
18-
<param name="archive">*.tar</param>
19-
<param name="files">*/packaging/redhat/glar150.spec</param>
20-
<param name="outfilename">glar150.spec</param>
21-
</service>
18+
<service name="tar" mode="buildtime"/>
2219

2320
<!-- extract debian packaging -->
24-
<service name="extract_file">
25-
<param name="archive">*.tar</param>
26-
<param name="files">*/packaging/debian/glar150.dsc.obs</param>
27-
<param name="outfilename">glar150.dsc</param>
28-
</service>
29-
<service name="extract_file">
21+
<service name="extract_file" mode="buildtime">
3022
<param name="archive">*.tar</param>
31-
<param name="files">*/packaging/debian/changelog</param>
23+
<param name="files">*/packaging/debian/changelog</param>
3224
<param name="outfilename">debian.changelog</param>
3325
</service>
34-
<service name="extract_file">
26+
<service name="extract_file" mode="buildtime">
3527
<param name="archive">*.tar</param>
3628
<param name="files">*/packaging/debian/compat</param>
3729
<param name="outfilename">debian.compat</param>
3830
</service>
39-
<service name="extract_file">
31+
<service name="extract_file" mode="buildtime">
4032
<param name="archive">*.tar</param>
4133
<param name="files">*/packaging/debian/control</param>
4234
<param name="outfilename">debian.control</param>
4335
</service>
44-
<service name="extract_file">
36+
<service name="extract_file" mode="buildtime">
4537
<param name="archive">*.tar</param>
4638
<param name="files">*/packaging/debian/copyright</param>
4739
<param name="outfilename">debian.copyright</param>
4840
</service>
49-
<service name="extract_file">
41+
<service name="extract_file" mode="buildtime">
5042
<param name="archive">*.tar</param>
5143
<param name="files">*/packaging/debian/glar150.install</param>
5244
<param name="outfilename">debian.glar150.install</param>
5345
</service>
54-
<service name="extract_file">
46+
<service name="extract_file" mode="buildtime">
5547
<param name="archive">*.tar</param>
5648
<param name="files">*/packaging/debian/glar150.manpages</param>
5749
<param name="outfilename">debian.glar150.manpages</param>
5850
</service>
59-
<service name="extract_file">
51+
<service name="extract_file" mode="buildtime">
6052
<param name="archive">*.tar</param>
6153
<param name="files">*/packaging/debian/format</param>
6254
<param name="outfilename">debian.format</param>
6355
</service>
64-
<service name="extract_file">
56+
<service name="extract_file" mode="buildtime">
6557
<param name="archive">*.tar</param>
6658
<param name="files">*/packaging/debian/libglar0.install</param>
6759
<param name="outfilename">debian.libglar0.install</param>
6860
</service>
69-
<service name="extract_file">
61+
<service name="extract_file" mode="buildtime">
7062
<param name="archive">*.tar</param>
7163
<param name="files">*/packaging/debian/libglar-dev.install</param>
7264
<param name="outfilename">debian.libglar-dev.install</param>
7365
</service>
74-
<service name="extract_file">
66+
<service name="extract_file" mode="buildtime">
7567
<param name="archive">*.tar</param>
7668
<param name="files">*/packaging/debian/libglar-dev.manpages</param>
7769
<param name="outfilename">debian.libglar-dev.manpages</param>
7870
</service>
79-
<service name="extract_file">
71+
<service name="extract_file" mode="buildtime">
8072
<param name="archive">*.tar</param>
8173
<param name="files">*/packaging/debian/rules</param>
8274
<param name="outfilename">debian.rules</param>
8375
</service>
8476

85-
<service name="set_version">
77+
<service name="set_version" mode="buildtime">
8678
<param name="basename">glar150</param>
8779
</service>
8880

89-
<service name="recompress">
81+
<service name="recompress" mode="buildtime">
9082
<param name="file">*.tar</param>
9183
<param name="compression">gz</param>
9284
</service>

‎project.xml

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<target name = "redhat" />
1616
<target name = "obs" />
1717
<target name = "travis" />
18+
<target name = "gh_actions" />
1819

1920
<use project = "zyre" />
2021

‎src/Makemodule.am

+4
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ code:
8484
cd $(srcdir)/src; gsl -topdir:.. -zproject:1 -q glar_node.xml
8585
cd $(srcdir); gsl -target:- project.xml
8686

87+
if ENABLE_GLAR_SELFTEST
8788
# Directories with test fixtures optionally provided by the project,
8889
# and with volatile RW data possibly created by a selftest program.
8990
# It is up to the project authors to populate the RO directory with
@@ -263,6 +264,7 @@ coverage: src/glar_selftest
263264
@echo "call make clean && configure --with-gcov to enable code coverage"
264265
@exit 1
265266
endif
267+
endif #ENABLE_GLAR_SELFTEST
266268

267269
bindings: python-bindings
268270

@@ -420,10 +422,12 @@ check-gitignore:
420422
echo "SKIP: $@ (no git)"; exit 0 ; \
421423
fi )
422424

425+
if ENABLE_GLAR_SELFTEST
423426
# This calls the recipe above after building the project products and
424427
# the selftest binary, and preparing the workspace for self-testing:
425428
check-gitignore-all: all src/glar_selftest $(top_builddir)/$(SELFTEST_DIR_RW) $(top_builddir)/$(SELFTEST_DIR_RO)
426429
$@$(MAKE) check-gitignore
430+
endif #ENABLE_GLAR_SELFTEST
427431

428432

429433
################################################################################

0 commit comments

Comments
 (0)