[Groonga-commit] groonga/packages.groonga.org at a992ddc [master] Support PGroonga

Zurück zum Archiv-Index

Kouhei Sutou null+****@clear*****
Wed Feb 3 01:10:57 JST 2016


Kouhei Sutou	2016-02-03 01:10:57 +0900 (Wed, 03 Feb 2016)

  New Revision: a992ddc47469af03b496c6b116fb6e7810ff74fa
  https://github.com/groonga/packages.groonga.org/commit/a992ddc47469af03b496c6b116fb6e7810ff74fa

  Message:
    Support PGroonga

  Modified files:
    ansible/files/create-snapshot-package.sh
    ansible/playbook.yml

  Modified: ansible/files/create-snapshot-package.sh (+31 -25)
===================================================================
--- ansible/files/create-snapshot-package.sh    2016-02-03 00:36:14 +0900 (61e31ce)
+++ ansible/files/create-snapshot-package.sh    2016-02-03 01:10:57 +0900 (70e46b7)
@@ -58,39 +58,44 @@ create_nightly_build() {
   if [ ! -d ${project_name} ]; then
     run git clone --quiet --recursive \
       https://github.com/${github_org}/${project_name}.git
-    run cd ${project_name}
-    run ./autogen.sh > /dev/null
-    run cd -
   else
     run cd ${project_name}
     run git checkout --quiet .
     run git pull --quiet --rebase
     run git submodule update --init
-    run ./autogen.sh > /dev/null
     run cd -
   fi
-  run cd ${project_name}
-  released_version=$(git describe --abbrev=0 | sed -e 's/^v//')
-  run cd -
-  version="${released_version}.${today}"
-  run rm -rf ${project_name}.build
-  run mkdir -p ${project_name}.build
-  run cd ${project_name}.build
-  run ../${project_name}/configure \
-    --prefix=$HOME/work/nightly \
-    "$@" \
-    > configure.log
-  run make > make.log 2> make.error.log
-  if [ "$need_install" = "yes" ]; then
-    run make install > /dev/null
+  if [ "${project_name}" = "pgroonga" ]; then
+    run cd ${project_name}
+    current_version=$(grep default_version pgroonga.control | \
+                         sed -r -e 's/^.*([0-9]+\.[0-9]+\.[0-9]).*$/\1/g')
+    version="${current_version}.${today}"
+    run rake2.1 dist SUFFIX=".${today}"
+  else
+    run cd ${project_name}
+    released_version=$(git describe --abbrev=0 | sed -e 's/^v//')
+    version="${released_version}.${today}"
+    run ./autogen.sh > /dev/null
+    run cd -
+    run rm -rf ${project_name}.build
+    run mkdir -p ${project_name}.build
+    run cd ${project_name}.build
+    run ../${project_name}/configure \
+        --prefix=$HOME/work/nightly \
+        "$@" \
+        > configure.log
+    run make > make.log 2> make.error.log
+    if [ "$need_install" = "yes" ]; then
+      run make install > /dev/null
+    fi
+    run make dist > /dev/null
+    run mkdir -p tmp
+    cd tmp
+    run tar xf ../*.tar.gz
+    run mv ${project_name}-* ${project_name}-${version}
+    run tar cfz ${project_name}-${version}.tar.gz ${project_name}-${version}
   fi
-  run make dist > /dev/null
-  run mkdir -p tmp
-  cd tmp
-  run tar xf ../*.tar.gz
-  run mv ${project_name}-* ${project_name}-${version}
-  run tar cfz ${project_name}-${version}.tar.gz ${project_name}-${version}
-  run mv ${project_name}-${version}.tar.gz ~/public/nightly/
+  run mv ${project_name}-${version}.* ~/public/nightly/
 }
 
 package_mariadb_with_mroonga() {
@@ -149,6 +154,7 @@ create_nightly_build mroonga mroonga no \
   --with-mysql-source="$HOME/work/${mysql_base}" \
   --with-mysql-config="$HOME/work/${mysql_base}/scripts/mysql_config"
 package_mariadb_with_mroonga
+create_nightly_build pgroonga pgroonga no
 
 run find "${output_dir}/" -maxdepth 1 -type f -ctime +${keep_n_days} -print0 | \
   run xargs --null --no-run-if-empty rm

  Modified: ansible/playbook.yml (+8 -0)
===================================================================
--- ansible/playbook.yml    2016-02-03 00:36:14 +0900 (b77e908)
+++ ansible/playbook.yml    2016-02-03 01:10:57 +0900 (30b4d10)
@@ -121,6 +121,14 @@
         - virtualbox
         - vagrant
         - rpm
+    - name: Install RubyGems for nightly package builder
+      gem:
+        name={{ item }}
+        user_install=no
+      with_items:
+        - rake
+        - octokit
+        - archive-zip
     - name: Install nightly package builder
       copy:
         src=files/create-snapshot-package.sh
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Zurück zum Archiv-Index