Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 6a6adc2

Browse filesBrowse files
authored
Merge pull request #18 from devatherock/fix-functional-test-failure
Fixed functional test failures
2 parents 3d85710 + 401e30d commit 6a6adc2
Copy full SHA for 6a6adc2

File tree

Expand file treeCollapse file tree

4 files changed

+12
-7
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

4 files changed

+12
-7
lines changed
Open diff view settings
Collapse file

‎.circleci/config.yml‎

Copy file name to clipboardExpand all lines: .circleci/config.yml
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
- save_cache:
103103
paths:
104104
- ~/.gradle
105-
key: v1-dependencies-{{ checksum "build.gradle" }}
105+
key: v1-dependencies-{{ checksum "build.gradle" }}
106106

107107
publish_release:
108108
executor: docker-executor
@@ -164,6 +164,7 @@ workflows:
164164
- functional_test:
165165
context:
166166
- docker-credentials
167+
- git-token
167168
requires:
168169
- publish
169170
- notify:
Collapse file

‎.gitignore‎

Copy file name to clipboardExpand all lines: .gitignore
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ git-sync.iml
88
.classpath
99
/bin/
1010
.settings
11-
checkstyle.xml
11+
checkstyle.xml
12+
git-sync-test
Collapse file

‎build.gradle‎

Copy file name to clipboardExpand all lines: build.gradle
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ sourceSets {
2323
main {
2424
groovy {
2525
srcDirs = ['.']
26-
exclude(['**/test/**', 'gradle/**', 'build/**', 'docker/**', 'bin/**'])
26+
exclude(['**/test/**', 'gradle/**', 'build/**', 'docker/**', 'bin/**', 'git-sync-test/**'])
2727
}
2828
}
2929
}
Collapse file

‎functional-tests.sh‎

Copy file name to clipboard
+7-4Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
#!/bin/sh
22

3-
cp -r . ../git-sync-test
4-
cd ../git-sync-test
3+
mkdir git-sync-test
4+
cp -r * git-sync-test
5+
cp -r .git git-sync-test
6+
cd git-sync-test
57
export CURRENT_BRANCH=$(git symbolic-ref --short HEAD)
68
git remote set-url origin "https://git-sync-token:$GIT_TOKEN@github.com/devatherock/git-sync.git"
79
./gradlew test --tests '*SyncGitReposDockerSpec*' -x jacocoTestCoverageVerification
810
exit_code=$?
9-
cd ../git-sync
10-
rm -rf ../git-sync-test
11+
cd ..
12+
rm -rf git-sync-test
13+
git remote set-url origin git@github.com:devatherock/git-sync.git
1114
exit $exit_code

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.