Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
srz-zumix committed Jun 28, 2018
2 parents b0ba54e + d8df51e commit 37deb72
Show file tree
Hide file tree
Showing 16 changed files with 648 additions and 418 deletions.
4 changes: 4 additions & 0 deletions .ci/appveyor/credential.yml.enc
@@ -0,0 +1,4 @@
;�jӎn^�t�c�0��?��d��P�^�ß�IY+�-\^�dK̦wKy��{[#W��(����?=�0��e��2U���w�L%��0�_��/_�M�fuqLqM�����Ҩ!�v衉{�I)q������L����X�+=n&��|3�N�P4X���0\w���� ��!��O#U#! �k7�����
\v\�+��5K��%q
J�,$��mX��%y����S���� D��t!XIw��]�.$�e�M
����
97 changes: 97 additions & 0 deletions .ci/make-package.sh
@@ -0,0 +1,97 @@
#!/bin/bash

if git rev-parse --ls-include-work-tree > /dev/null 2>&1; then
cd `pwd`/`git rev-parse --show-cdup`
fi

if [ ! -z $1 ]; then
RELEASE_VERSION=$1
#echo $RELEASE_VERSION
fi

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

if [ -z $RELEASE_VERSION ]; then
BRANCH_NAME=`git branch | grep -e "^*" | cut -d' ' -f 2`
RELEASE_VERSION=$BRANCH_NAME
fi

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]"`
if [ -z "$RELEASE_VERSION" ]; then
echo set dummy version
RELEASE_VERSION=v0.0.0
fi
RELEASE_VERSION=${RELEASE_VERSION#v}
fi

if [ ! -e ./package ]; then
mkdir package
fi

echo Release version $RELEASE_VERSION
PACKAGE_NAME=iutest-$RELEASE_VERSION
PACKAGE_ROOT=./package/v$RELEASE_VERSION

if [ -e $PACKAGE_ROOT ]; then
rm -rf $PACKAGE_ROOT
fi
mkdir $PACKAGE_ROOT

if [ `git diff --name-only` ]; then
echo diff detected...
# exit 1
else
# make fused
make -C tools/fused --no-print-directory
git add -f fused-src/*
git stash -u

# packaging
mkdir -p package
git archive --format=tar.gz 'stash@{0}' > $PACKAGE_ROOT/$PACKAGE_NAME.tar.gz
git archive --format=zip 'stash@{0}' > $PACKAGE_ROOT/$PACKAGE_NAME.zip

git stash drop
fi

# create release note
echo release note
echo version $RELEASE_VERSION > $PACKAGE_ROOT/RELEASENOTE
cat $PACKAGE_ROOT/RELEASENOTE
if [ $? != 0 ]; then
echo "$(<$PACKAGE_ROOT/RELEASENOTE)"
fi

# create changelog
CHANGELOG_FILE=$PACKAGE_ROOT/CHANGELOG-ja
echo change log
echo Changes for $RELEASE_VERSION > $CHANGELOG_FILE
if [ `grep 'Changes for $RELEASE_VERSION' CHANGES.md` ]; then
echo CHANGELOG is not found.
else
CHANGELOG_ENABLE=0
while read
do
line=$REPLY
if echo "$line" | grep -e "Changes for $RELEASE_VERSION$" > /dev/null; then
CHANGELOG_ENABLE=1
elif [ $CHANGELOG_ENABLE = 1 ]; then
if echo "$line" | grep -e "Changes for .*" > /dev/null; then
break
elif echo "$line" | grep -v "^--*$" > /dev/null; then
echo "$line" >> $CHANGELOG_FILE
fi
fi
done < CHANGES.md
fi

echo --------------------
cat $CHANGELOG_FILE
if [ $? != 0 ]; then
echo "$(<$CHANGELOG_FILE)"
fi
8 changes: 8 additions & 0 deletions .ci/osdn/Gemfile
@@ -0,0 +1,8 @@
# frozen_string_literal: true

source "https://rubygems.org"

git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }

# gem "rails"
gem "osdn-cli"
25 changes: 25 additions & 0 deletions .ci/osdn/Gemfile.lock
@@ -0,0 +1,25 @@
GEM
remote: https://rubygems.org/
specs:
ethon (0.11.0)
ffi (>= 1.3.0)
ffi (1.9.25)
hashie (3.5.7)
json (1.8.6)
osdn-cli (0.1.9)
hashie
osdn-client (>= 0.0.20161003, < 1.0.0)
osdn-client (0.0.20161003)
json (~> 1.8, >= 1.8.3)
typhoeus (~> 1.0, >= 1.0.1)
typhoeus (1.3.0)
ethon (>= 0.9.0)

PLATFORMS
ruby

DEPENDENCIES
osdn-cli

BUNDLED WITH
1.16.1
10 changes: 10 additions & 0 deletions .gitattributes
Expand Up @@ -53,3 +53,13 @@ COPYING text eol=lf

# Docker
Dockerfile text eol=lf

# export settings
.ci export-ignore
.circleci export-ignore
*.yml export-ignore
Jenkinsfile export-ignore
tox.ini export-ignore
docs/dev export-ignore
.gitignore export-ignore
.gitattributes export-ignore
15 changes: 15 additions & 0 deletions .gitignore
Expand Up @@ -22,6 +22,8 @@
*.pyc
*.VC.db
*.tmp
*.zip
*.tar.gz
*.egg-info/
coverage.info
test/*.xml
Expand Down Expand Up @@ -51,8 +53,21 @@ bld/
fused-src/
tmp/

# bundle
.bundle/
vendor/

# secret
credential.yml

# execute files
projects/make/sample

*コピー*
.jflintrc

# appveyor
appveyor-tools/

# package
package/
4 changes: 3 additions & 1 deletion .travis.yml
Expand Up @@ -225,4 +225,6 @@ matrix:

notifications:
webhooks:
secure: Oxajh80h7/RI6otg8Xd2QkglQU0y8ug+f8GVC/BV9VnS9cFWk10z+/69OOBFGCTN7Qjgp+MwOkrQz4a50bIIlrTQtTnw0SmMKd+qIWVJ55xXnSCqWcGE7cD1Rx5/ZmFaAZ0khTZzHwSjhCN4gexLf/aYmG3AnXLXhqNnxkZ73nY=
urls:
- secure: Oxajh80h7/RI6otg8Xd2QkglQU0y8ug+f8GVC/BV9VnS9cFWk10z+/69OOBFGCTN7Qjgp+MwOkrQz4a50bIIlrTQtTnw0SmMKd+qIWVJ55xXnSCqWcGE7cD1Rx5/ZmFaAZ0khTZzHwSjhCN4gexLf/aYmG3AnXLXhqNnxkZ73nY=
- secure: T+ZBCfi1TBStN2eXidtV0J5AjQqtNEXIQtytuJWpgAdgCHSD73gJusSzE9nB0k0I28i1fn6meSuGVmGPdH7CUJdjRVUgbsCSGJot6mi2iR8Qe1+ST1AnS7cD5TvhhmKba5quaIhsv8jAVTmUMYvsX40cZYV99hSUzSegJQjsVXg=

0 comments on commit 37deb72

Please sign in to comment.