Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Problem: Out-of-date zproject #85

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 56 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# This is a skeleton created by zproject.
# You can add hand-written code here.

BasedOnStyle: LLVM
IndentWidth: 4
UseTab: Never
BreakBeforeBraces: Custom
BraceWrapping:
AfterClass: true
AfterControlStatement: false
AfterEnum: true
AfterFunction: true
AfterNamespace: true
AfterObjCDeclaration: true
AfterStruct: true
AfterUnion: true
BeforeCatch: true
BeforeElse: false
IndentBraces: false

AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AllowShortIfStatementsOnASingleLine: false
IndentCaseLabels: true
BinPackArguments: true
BinPackParameters: false
AlignTrailingComments: true
AllowShortBlocksOnASingleLine: false
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortFunctionsOnASingleLine: InlineOnly
AlwaysBreakTemplateDeclarations: false
ColumnLimit: 80
MaxEmptyLinesToKeep: 2
KeepEmptyLinesAtTheStartOfBlocks: false
ContinuationIndentWidth: 2
PointerAlignment: Right
ReflowComments: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: Always
SpaceInEmptyParentheses: false
SpacesInAngles: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Cpp11

SortIncludes: false

FixNamespaceComments: false
BreakBeforeBinaryOperators: NonAssignment
SpaceAfterTemplateKeyword: true
AlignAfterOpenBracket: Align
AlignOperands: true
BreakConstructorInitializers: AfterColon
ConstructorInitializerAllOnOneLineOrOnePerLine: true
SpaceAfterCStyleCast: true
BreakBeforeTernaryOperators: true
19 changes: 19 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# This is a skeleton created by zproject.
# You can add hand-written code here.
# See http://editorconfig.org/ and https://github.com/editorconfig/ for
# details about the format and links to plugins for IDEs and editors which
# do not yet support this configuration out of the box - but easily can.

# This is a top-level setting for project sources under this directory
root = true

[*]
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
charset = utf-8

[*.am]
indent_style = tab
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# This is a skeleton created by zproject.
# You can add hand-written code here.
# disables auto CRLF conversion for all files; create the file correctly and it will be allright
* -text
93 changes: 93 additions & 0 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
# Github Actions CI script
# This is a skeleton created by zproject.
# You can add hand-written code here.

name: CI
on:
push:
pull_request:


jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
- os: ubuntu-20.04
BUILD_TYPE: default
DRAFT: enabled
CLANG_FORMAT: clang-format-11
PACKAGES: automake autoconf clang-format-11 git libzmq3-dev libczmq-dev asciidoc xmlto
- os: ubuntu-20.04
BUILD_TYPE: default
DRAFT: disabled
CLANG_FORMAT: clang-format-11
PACKAGES: automake autoconf clang-format-11 git libzmq3-dev libczmq-dev
- os: ubuntu-20.04
BUILD_TYPE: valgrind
DRAFT: enabled
PACKAGES: automake autoconf valgrind git libzmq3-dev libczmq-dev
- os: ubuntu-20.04
BUILD_TYPE: cmake
DRAFT: enabled
PACKAGES: cmake git libzmq3-dev libczmq-dev
- os: macos-latest
BUILD_TYPE: default
PACKAGES: automake autoconf zeromq
DRAFT: enabled
- os: macos-latest
BUILD_TYPE: default
DRAFT: disabled
PACKAGES: automake autoconf zeromq
# For non-cmake users, there is an autotools solution with a bit more overhead
# to have dependencies ready and pass configure script before making this check).
# Note that the autotools variant will also require dependencies preinstalled to
# pass its configure script:
- os: ubuntu-20.04
BUILD_TYPE: cmake
DO_CLANG_FORMAT_CHECK: 1
CLANG_FORMAT: clang-format-11
PACKAGES: cmake clang-format-11 git libzmq3-dev libczmq-dev
env:
# Set CI_TIME: true to enable build-step profiling
# Set CI_TRACE: true to enable shell script tracing
# Set CI_CONFIG_QUIET: true to enable "configure --quiet" (only report stderr)
# Set CI_REQUIRE_GOOD_GITIGNORE: false to NOT fail if "git status -s" is not clean
# Set CI_REQUIRE_GOOD_CLANG_FORMAT: true to fail if "clang-format" check is not clean
CI_TIME: false
CI_TRACE: false
CI_CONFIG_QUIET: true
CI_REQUIRE_GOOD_GITIGNORE: false
CI_REQUIRE_GOOD_CLANG_FORMAT: false
CI_TEST_DISTCHECK: true
platform: ${{ matrix.platform }}
configuration: ${{ matrix.configuration }}
ENABLE_DRAFTS: ${{ matrix.ENABLE_DRAFTS }}
BUILD_TYPE: ${{ matrix.BUILD_TYPE }}
DRAFT: ${{ matrix.DRAFT }}
DO_CLANG_FORMAT_CHECK: ${{ matrix.DO_CLANG_FORMAT_CHECK }}
CLANG_FORMAT: ${{ matrix.CLANG_FORMAT }}
CI_SELFTEST: ${{ matrix.CI_SELFTEST }}
steps:
- name: Add debian packages
if: matrix.os == 'ubuntu-20.04'
uses: myci-actions/add-deb-repo@10
with:
repo-name: obs
repo: deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_20.04/ ./
keys-asc: https://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_20.04/Release.key
install: ${{ matrix.PACKAGES }}
- name: Add brew packages
if: matrix.os == 'macos-latest'
shell: bash
run: brew install ${{ matrix.PACKAGES }}
- uses: actions/checkout@v2
with:
path: filemq
- name: build
if: matrix.os == 'ubuntu-20.04' || matrix.os == 'macos-latest'
shell: bash
working-directory: filemq
run: ./ci_build.sh
58 changes: 55 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
# Own created files
# This is a skeleton created by zproject.
# You can add hand-written code here.
save.xml
src/.cache
src/filemq.lst
src/fmq_selftest
src/fmq_sha.lst
src/mymusic
src/testit
src/track

# Object files
*.o
*.so
Expand Down Expand Up @@ -36,6 +38,11 @@ src/filemq_selftest
*.app
core

# Distcheck workspace and archives
/filemq-*/
/filemq-*.tar.gz
/filemq-*.zip

# Man pages
doc/*.1
doc/*.3
Expand All @@ -55,6 +62,7 @@ config.log
config.status
config/
configure
configure.lineno
libtool
src/platform.h
src/platform.h.in
Expand All @@ -68,9 +76,32 @@ CMakeCache.txt
CMakeFiles/
CTestTestfile.cmake
cmake_install.cmake
compile_commands.json
DartConfiguration.tcl
install_manifest.txt
Testing/

# Repositories downloaded by CI integration scripts
tmp-deps/

# Travis build area
tmp/

# Valgrind files
callgrind*
vgcore*

# Vagrant files
.vagrant

# CLion / PyCharm
.idea

# GYP files
project.Makefile
*.target.mk
out/

# Android build results
builds/android/prefix

Expand All @@ -80,9 +111,30 @@ src/app/gen/
src/app/obj/
src/app/local.properties

# Android -dependencies
# Android - dependencies
src/app/jni/output

# Python build directory
build/

# MSVC build directories
obj/
bin/
*.tlog

# Qt
*pro.user
moc_*
build-*
bindings/qt/selftest/selftest

# Temporary files
*.swp
*.bak
.test*

# Netbeans directory
nbproject/

# editor backups
*~
28 changes: 28 additions & 0 deletions .obs/workflows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
pull_request:
steps:
- branch_package:
source_project: network:messaging:zeromq:git-draft
source_package: filemq
target_project: network:messaging:zeromq:ci
filters:
event: pull_request
merge:
steps:
- trigger_services:
project: network:messaging:zeromq:git-stable
package: filemq
filters:
event: push
branches:
only:
- master
release:
steps:
- trigger_services:
project: network:messaging:zeromq:release-stable
package: filemq
- trigger_services:
project: network:messaging:zeromq:release-draft
package: filemq
filters:
event: tag_push
Loading