• R/O
  • SSH
  • HTTPS

iutest: コミット


コミットメタ情報

リビジョン1363 (tree)
日時2019-01-07 10:23:40
作者srz_zumix

ログメッセージ

Merge remote-tracking branch 'origin/develop'

git@fcdb3d2c13595e7b4142ce0b9349f06f9efef318
https://github.com/srz-zumix/iutest/commit/fcdb3d2c13595e7b4142ce0b9349f06f9efef318

変更サマリ

  • modified: trunk/buddy.yml (diff)
  • delete: trunk/projects/android/iutest_sample/AndroidManifest.xml
  • delete: trunk/projects/android/iutest_sample/jni/Android.mk
  • delete: trunk/projects/android/iutest_sample/jni/Application.mk
  • delete: trunk/projects/android/iutest_sample/jni
  • delete: trunk/projects/android/iutest_sample
  • delete: trunk/projects/android

差分

--- trunk/buddy.yml (revision 1362)
+++ trunk/buddy.yml (revision 1363)
@@ -1,15 +1,3 @@
1-- .gtest-version-action-template: &gtest-version-action-template
2- type: "BUILD"
3- working_directory: "/buddy/iutest"
4- docker_image_name: "srzzumix/googletest"
5- execute_commands:
6- - "cd test"
7- - "make USE_GTEST=1 ${MAKE_OPTION} gtest-version"
8- - "make USE_GTEST=1 USE_GMOCK=1 ${MAKE_OPTION} gtest-version"
9- mount_filesystem_path: "/buddy/iutest"
10- shell: "SH"
11- trigger_condition: "ALWAYS"
12-
131 - pipeline: "build-arm-none-eabi"
142 trigger_mode: "ON_EVERY_PUSH"
153 ref_name: "(^(master|develop)*$)"
@@ -51,12 +39,10 @@
5139 working_directory: "/buddy/iutest"
5240 docker_image_name: "srzzumix/googletest"
5341 docker_image_tag: "latest"
54- setup_commands:
55- - "export MAKE_OPTION=\"GTEST_EXPECT_VER=0x01080100 GTEST_EXPECT_LATEST=1\""
5642 execute_commands:
5743 - "cd test"
58- - "make USE_GTEST=1 ${MAKE_OPTION} gtest-version"
59- - "make USE_GTEST=1 USE_GMOCK=1 ${MAKE_OPTION} gtest-version"
44+ - "make USE_GTEST=1 GTEST_EXPECT_VER=0x01080100 GTEST_EXPECT_LATEST=1 gtest-version"
45+ - "make USE_GTEST=1 USE_GMOCK=1 GTEST_EXPECT_VER=0x01080100 GTEST_EXPECT_LATEST=1 gtest-version"
6046 mount_filesystem_path: "/buddy/iutest"
6147 shell: "SH"
6248 trigger_condition: "ALWAYS"
--- trunk/projects/android/iutest_sample/AndroidManifest.xml (revision 1362)
+++ trunk/projects/android/iutest_sample/AndroidManifest.xml (nonexistent)
@@ -1,16 +0,0 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3- package="jp.iutest_sample"
4- android:versionCode="1"
5- android:versionName="1.0">
6- <uses-sdk android:minSdkVersion="21">
7- <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
8- <activity android:name="iutest_sample_activity"
9- android:label="@string/app_name">
10- <intent-filter>
11- <action android:name="android.intent.action.MAIN" />
12- <category android:name="android.intent.category.LAUNCHER" />
13- </intent-filter>
14- </activity>
15- </application>
16-</manifest>
旧リポジトリブラウザで表示