Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feature/exception_…
Browse files Browse the repository at this point in the history
…scoped_trace
  • Loading branch information
srz-zumix committed Dec 18, 2019
2 parents 5a4a6c9 + 9a631b3 commit 220da36
Show file tree
Hide file tree
Showing 64 changed files with 1,423 additions and 457 deletions.
17 changes: 11 additions & 6 deletions .ci/make-package.sh
@@ -1,5 +1,7 @@
#!/bin/bash

set -e

if git rev-parse --ls-include-work-tree > /dev/null 2>&1; then
IUTEST_ROOT=`pwd`/`git rev-parse --show-cdup`
cd $IUTEST_ROOT
Expand All @@ -12,8 +14,11 @@ fi

if [ -z $RELEASE_VERSION ]; then
echo get branch name from HEAD
BRANCH_NAME=`echo $(\git symbolic-ref --short HEAD) | sed s:/:-:g` 2>/dev/null
RELEASE_VERSION=$BRANCH_NAME
git symbolic-ref --short HEAD >/dev/null && :
if [ $? = 0 ]; then
BRANCH_NAME=`echo $(\git symbolic-ref --short HEAD) | sed s:/:-:g` 2>/dev/null
RELEASE_VERSION=$BRANCH_NAME
fi
fi

if [ -z $RELEASE_VERSION ]; then
Expand All @@ -22,9 +27,9 @@ if [ -z $RELEASE_VERSION ]; then
RELEASE_VERSION=$BRANCH_NAME
fi

echo ${RELEASE_VERSION} | grep -e "^[0-9]*.[0.9]*.[0-9]*$" > /dev/null
echo ${RELEASE_VERSION} | grep -e "^[0-9]*.[0.9]*.[0-9]*$" > /dev/null && :
if [ $? != 0 ]; then
RELEASE_VERSION=`echo ${RELEASE_VERSION} | grep -e "v[0-9]*.[0.9]*.[0-9]*"`
RELEASE_VERSION=`echo ${RELEASE_VERSION} | grep -e "v[0-9]*.[0.9]*.[0-9]*" || true`
if [ -z "$RELEASE_VERSION" ]; then
echo set dummy version
RELEASE_VERSION=v0.0.0
Expand Down Expand Up @@ -69,7 +74,7 @@ if $can_packaging; then
# make fused
make -C tools/fused --no-print-directory
git add -f fused-src/*
git stash -u
git -c user.name=make-package -c user.email=make-package@test.com stash -u

# packaging
mkdir -p package
Expand Down Expand Up @@ -102,7 +107,7 @@ else
line=$REPLY
if echo "$line" | grep -e "Changes for $RELEASE_VERSION$" > /dev/null; then
CHANGELOG_ENABLE=1
elif [ $CHANGELOG_ENABLE = 1 ]; then
elif [ $CHANGELOG_ENABLE = 1 ]; then
if echo "$line" | grep -e "Changes for .*" > /dev/null; then
break
elif echo "$line" | grep -v "^--*$" > /dev/null; then
Expand Down
1 change: 1 addition & 0 deletions .ci/osdn/.gitignore
@@ -0,0 +1 @@
*.lock
19 changes: 19 additions & 0 deletions .ci/osdn/Dockerfile
@@ -0,0 +1,19 @@
# Usage
# docker build .ci/osdn -t osdn
# docker run -it -v $(pwd):/iutest -e VERSION=v1.17.0 osd

FROM ruby:2.5

LABEL maintainer "srz_zumix <https://github.com/srz-zumix>"

RUN gem install osdn-cli
VOLUME $HOME/.config/osdn

ENV LANG C.UTF-8

VOLUME /iutest
WORKDIR /iutest

COPY entrypoint.sh /entrypoint.sh

ENTRYPOINT ["/entrypoint.sh"]
25 changes: 0 additions & 25 deletions .ci/osdn/Gemfile.lock

This file was deleted.

6 changes: 6 additions & 0 deletions .ci/osdn/entrypoint.sh
@@ -0,0 +1,6 @@
#!/bin/sh

cd .ci/osdn

osdn login
./release.sh $VERSION
8 changes: 7 additions & 1 deletion .ci/osdn/release.sh
@@ -1,9 +1,11 @@
#!/bin/bash
# Usage: release.sh [version]

set -e

# make-package
BASEDIR=$(dirname "$0")
source $BASEDIR/../make-package.sh $*
. $BASEDIR/../make-package.sh $*

echo ====================
echo osdn release
Expand Down Expand Up @@ -31,6 +33,10 @@ cd $BASEDIR
FRS_ROOT=osdn_frs
osdn vars set project iutest
PACKAGE_ID=`osdn package | grep -o '[0-9]* iutest ' | cut -d ' ' -f 1`
if [ -z "$PACKAGE_ID" ]; then
echo osdn package not found..
exit 1
fi
RELEASE_ID=`osdn release --package $PACKAGE_ID | grep -o "[0-9]* $RELEASE_NAME " | cut -d ' ' -f 1`
if [ -z "$RELEASE_ID" ]; then
osdn release create -v hidden --package $PACKAGE_ID $RELEASE_NAME
Expand Down
19 changes: 16 additions & 3 deletions .circleci/config.yml
Expand Up @@ -76,19 +76,31 @@ jobs:
environment:
CXX: clang++
- run:
name: g++ test
name: g++ build
command: |
make clean
case $CIRCLE_NODE_INDEX in 0) make $MAKE_TARGET $MAKE_OPTION OPTIMIZE=-O2 ;; 1) make $MAKE_TARGET $MAKE_OPTION OPTIMIZE=-Os ;; 2) make $MAKE_TARGET $MAKE_OPTION OPTIMIZE=-O3 ;; 3) make $MAKE_TARGET $MAKE_OPTION OPTIMIZE=-O4 ;; esac
working_directory: test
environment:
CXX: g++
- run:
name: g++ test
command: |
make $MAKE_RUN_TARGET
working_directory: test
environment:
CXX: g++
- run:
name: clang++ test
name: clang++ build
command: |
make clean
case $CIRCLE_NODE_INDEX in 0) make $MAKE_TARGET $MAKE_OPTION OPTIMIZE=-O2 ;; 1) make $MAKE_TARGET $MAKE_OPTION OPTIMIZE=-Os ;; 2) make $MAKE_TARGET $MAKE_OPTION OPTIMIZE=-O3 ;; 3) make $MAKE_TARGET $MAKE_OPTION OPTIMIZE=-Oz ;; esac
working_directory: test
environment:
CXX: clang++
- run:
name: clang++ test
command: |
make $MAKE_RUN_TARGET
working_directory: test
environment:
Expand Down Expand Up @@ -119,5 +131,6 @@ workflows:
only:
- master
- develop
#- /^feature.*/
- /^feature.*/
- /^fix.*/
- /^circleci.*/
16 changes: 11 additions & 5 deletions .cirrus.yml
Expand Up @@ -9,7 +9,9 @@ cirrus_gcc_test_task:
STDFLAG: -std=c++17
STDFLAG: -std=c++2a
version_script: make -C test showcxxversion
test_script: cd test && make -j4 && make test
# NOTE: -j$((`nproc`)): Container errored with 'OOMKilled'
build_script: make -C test -j4
test_script: make -C test test

#cirrus_use_gtest_task:
# env:
Expand All @@ -22,17 +24,20 @@ cirrus_osx_14_test_task: &osx_task
only_if: *default-condition
auto_cancellation: true
osx_instance:
image: mojave-xcode-10.1
# image: high-sierra-xcode-9.4.1
image: mojave-xcode
env:
STDFLAG: -std=c++14
version_script: make -C test showcxxversion
test_script: cd test && make -j4 && make test
build_script: make -C test -j$((`getconf _NPROCESSORS_ONLN`))
test_script : make -C test test

cirrus_osx_17_test_task:
<<: *osx_task
env:
STDFLAG: -std=c++17
# https://stackoverflow.com/questions/56924853/why-xcode-11-beta-cant-use-c17s-filesystem-header
# ** Comment out because the image is mojave **
# CXXFLAGS: -mmacosx-version-min=10.15
depends_on:
- cirrus_osx_14_test

Expand All @@ -51,5 +56,6 @@ cirrus_freebsd_clang_test_task:
#STDFLAG: -std=c++2a
install_script: pkg install -y gmake
version_script: gmake --version && gmake -C test showcxxversion
test_script: cd test && gmake -j4 && gmake test
build_script: gmake -C test -j4
test_script : gmake -C test test

37 changes: 24 additions & 13 deletions .drone.yml
Expand Up @@ -6,18 +6,24 @@ trigger:
- master
- develop
- feature/*
- fix/*
- drone/*

steps:
- name: release-1.8.1
image: srzzumix/googletest:release-1.8.1
- name: release-1.10.0
image: srzzumix/googletest:release-1.10.0
environment:
GTEST_EXPECT_VERSION: 0x01080100
GTEST_EXPECT_VERSION: 0x01100000
commands: &gtest-compatible-commands
- "cd test"
- "make showcxxversion"
- "make USE_GTEST=1 GTEST_EXPECT_VER=${GTEST_EXPECT_VERSION} test"
- "make USE_GTEST=1 USE_GMOCK=1 GTEST_EXPECT_VER=${GTEST_EXPECT_VERSION} test"
- "make USE_GTEST=1 GTEST_EXPECT_VER=$${GTEST_EXPECT_VERSION} test"
- "make USE_GTEST=1 USE_GMOCK=1 GTEST_EXPECT_VER=$${GTEST_EXPECT_VERSION} test"
- name: release-1.8.1
image: srzzumix/googletest:release-1.8.1
environment:
GTEST_EXPECT_VERSION: 0x01080100
commands: *gtest-compatible-commands
- name: release-1.8.0
image: srzzumix/googletest:release-1.8.0
environment:
Expand Down Expand Up @@ -96,25 +102,30 @@ steps:
- name: latest
image: srzzumix/googletest:latest
environment:
GTEST_EXPECT_VERSION: 0x01080100
GTEST_EXPECT_VERSION: 0x01100000
commands:
- "cd test"
- "make showcxxversion"
- "make USE_GTEST=1 GTEST_EXPECT_VER=${GTEST_EXPECT_VERSION} GTEST_EXPECT_LATEST=1 gtest-version"
- "make USE_GTEST=1 USE_GMOCK=1 GTEST_EXPECT_VER=${GTEST_EXPECT_VERSION} GTEST_EXPECT_LATEST=1 gtest-version"
- "make USE_GTEST=1 GTEST_EXPECT_VER=$${GTEST_EXPECT_VERSION} GTEST_EXPECT_LATEST=1 gtest-version"
- "make USE_GTEST=1 USE_GMOCK=1 GTEST_EXPECT_VER=$${GTEST_EXPECT_VERSION} GTEST_EXPECT_LATEST=1 gtest-version"
when:
branch:
exclude:
- master
- name: release-1.8.1
image: srzzumix/googletest:release-1.8.1
- name: release-1.10.0
image: srzzumix/googletest:release-1.10.0
environment:
GTEST_EXPECT_VERSION: 0x01080100
GTEST_EXPECT_VERSION: 0x01100000
commands: &gtest-version-detect-commands
- "cd test"
- "make showcxxversion"
- "make USE_GTEST=1 GTEST_EXPECT_VER=${GTEST_EXPECT_VERSION} gtest-version"
- "make USE_GTEST=1 USE_GMOCK=1 GTEST_EXPECT_VER=${GTEST_EXPECT_VERSION} gtest-version"
- "make USE_GTEST=1 GTEST_EXPECT_VER=$${GTEST_EXPECT_VERSION} gtest-version"
- "make USE_GTEST=1 USE_GMOCK=1 GTEST_EXPECT_VER=$${GTEST_EXPECT_VERSION} gtest-version"
- name: release-1.8.1
image: srzzumix/googletest:release-1.8.1
environment:
GTEST_EXPECT_VERSION: 0x01080100
commands: *gtest-version-detect-commands
- name: release-1.8.0
image: srzzumix/googletest:release-1.8.0
environment:
Expand Down
4 changes: 4 additions & 0 deletions .gitattributes
Expand Up @@ -57,9 +57,13 @@ Dockerfile text eol=lf
# export settings
.ci export-ignore
.circleci export-ignore
.github export-ignore
.semaphre export-ignore
*.yml export-ignore
*.yaml export-ignore
Jenkinsfile export-ignore
tox.ini export-ignore
docs/dev export-ignore
.bandit export-ignore
.gitignore export-ignore
.gitattributes export-ignore
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,14 @@
---
name: Feature Request
about: Create a feature request
title: ''
labels: feature
assignees: ''

---

**Describe the feature**
A clear and concise description of what the feature is.

**Additional context**
Add any other context about the feature here.
7 changes: 5 additions & 2 deletions .github/actions/arm-none-eabi/build.sh
@@ -1,5 +1,8 @@
#!/bin/sh

cd test
make showcxxversion showcxxmacros DEFS="--specs=nosys.specs -mthumb -mcpu=cortex-m3"
make DEFS="--specs=nosys.specs -mthumb -mcpu=cortex-m3"
DEFS="--specs=nosys.specs -mthumb -mcpu=cortex-m3"

make showcxxversion showcxxmacros DEFS="$DEFS"
make showcxxversion check_stdlib DEFS="$DEFS"
make DEFS="$DEFS"

0 comments on commit 220da36

Please sign in to comment.