Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
3fde7b0f
Commit
3fde7b0f
authored
May 09, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update the .gitignore, .gitlab-ci.yml, and Dockerfile templates
parent
9a54cb36
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
27 additions
and
15 deletions
+27
-15
vendor/gitignore/Global/JetBrains.gitignore
vendor/gitignore/Global/JetBrains.gitignore
+2
-1
vendor/gitignore/Global/Vim.gitignore
vendor/gitignore/Global/Vim.gitignore
+2
-0
vendor/gitignore/Java.gitignore
vendor/gitignore/Java.gitignore
+1
-0
vendor/gitignore/Objective-C.gitignore
vendor/gitignore/Objective-C.gitignore
+1
-1
vendor/gitignore/Swift.gitignore
vendor/gitignore/Swift.gitignore
+1
-1
vendor/gitignore/TeX.gitignore
vendor/gitignore/TeX.gitignore
+6
-0
vendor/gitignore/Unity.gitignore
vendor/gitignore/Unity.gitignore
+2
-1
vendor/gitignore/VisualStudio.gitignore
vendor/gitignore/VisualStudio.gitignore
+1
-0
vendor/gitlab-ci-yml/Chef.gitlab-ci.yml
vendor/gitlab-ci-yml/Chef.gitlab-ci.yml
+1
-1
vendor/gitlab-ci-yml/Docker.gitlab-ci.yml
vendor/gitlab-ci-yml/Docker.gitlab-ci.yml
+1
-1
vendor/gitlab-ci-yml/Maven.gitlab-ci.yml
vendor/gitlab-ci-yml/Maven.gitlab-ci.yml
+1
-1
vendor/gitlab-ci-yml/Swift.gitlab-ci.yml
vendor/gitlab-ci-yml/Swift.gitlab-ci.yml
+8
-8
No files found.
vendor/gitignore/Global/JetBrains.gitignore
View file @
3fde7b0f
...
@@ -4,7 +4,8 @@
...
@@ -4,7 +4,8 @@
# User-specific stuff
# User-specific stuff
.idea/**/workspace.xml
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/tasks.xml
.idea/dictionaries
.idea/**/dictionaries
.idea/**/shelf
# Sensitive or high-churn files
# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources/
...
...
vendor/gitignore/Global/Vim.gitignore
View file @
3fde7b0f
...
@@ -12,3 +12,5 @@ Session.vim
...
@@ -12,3 +12,5 @@ Session.vim
*~
*~
# Auto-generated tag files
# Auto-generated tag files
tags
tags
# Persistent undo
[._]*.un~
vendor/gitignore/Java.gitignore
View file @
3fde7b0f
...
@@ -13,6 +13,7 @@
...
@@ -13,6 +13,7 @@
# Package Files #
# Package Files #
*.jar
*.jar
*.war
*.war
*.nar
*.ear
*.ear
*.zip
*.zip
*.tar.gz
*.tar.gz
...
...
vendor/gitignore/Objective-C.gitignore
View file @
3fde7b0f
...
@@ -52,7 +52,7 @@ Carthage/Build
...
@@ -52,7 +52,7 @@ Carthage/Build
fastlane/report.xml
fastlane/report.xml
fastlane/Preview.html
fastlane/Preview.html
fastlane/screenshots
fastlane/screenshots
/**/*.png
fastlane/test_output
fastlane/test_output
# Code Injection
# Code Injection
...
...
vendor/gitignore/Swift.gitignore
View file @
3fde7b0f
...
@@ -64,5 +64,5 @@ Carthage/Build
...
@@ -64,5 +64,5 @@ Carthage/Build
fastlane/report.xml
fastlane/report.xml
fastlane/Preview.html
fastlane/Preview.html
fastlane/screenshots
fastlane/screenshots
/**/*.png
fastlane/test_output
fastlane/test_output
vendor/gitignore/TeX.gitignore
View file @
3fde7b0f
...
@@ -198,6 +198,9 @@ pythontex-files-*/
...
@@ -198,6 +198,9 @@ pythontex-files-*/
# easy-todo
# easy-todo
*.lod
*.lod
# xmpincl
*.xmpi
# xindy
# xindy
*.xdy
*.xdy
...
@@ -234,3 +237,6 @@ TSWLatexianTemp*
...
@@ -234,3 +237,6 @@ TSWLatexianTemp*
# standalone packages
# standalone packages
*.sta
*.sta
# generated if using elsarticle.cls
*.spl
vendor/gitignore/Unity.gitignore
View file @
3fde7b0f
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
Assets/AssetStoreTools*
Assets/AssetStoreTools*
# Visual Studio cache directory
# Visual Studio cache directory
/
.vs/
.vs/
# Autogenerated VS/MD/Consulo solution and project files
# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
ExportedObj/
...
@@ -22,6 +22,7 @@ ExportedObj/
...
@@ -22,6 +22,7 @@ ExportedObj/
*.booproj
*.booproj
*.svd
*.svd
*.pdb
*.pdb
*.opendb
# Unity3D generated meta files
# Unity3D generated meta files
*.pidb.meta
*.pidb.meta
...
...
vendor/gitignore/VisualStudio.gitignore
View file @
3fde7b0f
...
@@ -240,6 +240,7 @@ Backup*/
...
@@ -240,6 +240,7 @@ Backup*/
UpgradeLog*.XML
UpgradeLog*.XML
UpgradeLog*.htm
UpgradeLog*.htm
ServiceFabricBackup/
ServiceFabricBackup/
*.rptproj.bak
# SQL Server files
# SQL Server files
*.mdf
*.mdf
...
...
vendor/gitlab-ci-yml/Chef.gitlab-ci.yml
View file @
3fde7b0f
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
image
:
"
chef/chefdk"
image
:
"
chef/chefdk"
services
:
services
:
-
docker:
stable-
dind
-
docker:dind
variables
:
variables
:
DOCKER_HOST
:
"
tcp://docker:2375"
DOCKER_HOST
:
"
tcp://docker:2375"
...
...
vendor/gitlab-ci-yml/Docker.gitlab-ci.yml
View file @
3fde7b0f
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
image
:
docker:latest
image
:
docker:latest
services
:
services
:
-
docker:
stable-
dind
-
docker:dind
before_script
:
before_script
:
-
docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-
docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
...
...
vendor/gitlab-ci-yml/Maven.gitlab-ci.yml
View file @
3fde7b0f
...
@@ -24,7 +24,7 @@ variables:
...
@@ -24,7 +24,7 @@ variables:
MAVEN_CLI_OPTS
:
"
--batch-mode
--errors
--fail-at-end
--show-version
-DinstallAtEnd=true
-DdeployAtEnd=true"
MAVEN_CLI_OPTS
:
"
--batch-mode
--errors
--fail-at-end
--show-version
-DinstallAtEnd=true
-DdeployAtEnd=true"
# Cache downloaded dependencies and plugins between builds.
# Cache downloaded dependencies and plugins between builds.
# To keep cache across branches add 'key: "$CI_JOB_
REF_
NAME"'
# To keep cache across branches add 'key: "$CI_JOB_NAME"'
cache
:
cache
:
paths
:
paths
:
-
.m2/repository
-
.m2/repository
...
...
vendor/gitlab-ci-yml/Swift.gitlab-ci.yml
View file @
3fde7b0f
# Lifted from: https://about.gitlab.com/2016/03/10/setting-up-gitlab-ci-for-ios-projects/
# Lifted from: https://about.gitlab.com/2016/03/10/setting-up-gitlab-ci-for-ios-projects/
# This file assumes an own GitLab CI runner, setup on an
OS X
system.
# This file assumes an own GitLab CI runner, setup on an
macOS
system.
stages
:
stages
:
-
build
-
build
-
archive
-
archive
...
@@ -8,11 +8,11 @@ build_project:
...
@@ -8,11 +8,11 @@ build_project:
stage
:
build
stage
:
build
script
:
script
:
-
xcodebuild clean -project ProjectName.xcodeproj -scheme SchemeName | xcpretty
-
xcodebuild clean -project ProjectName.xcodeproj -scheme SchemeName | xcpretty
-
xcodebuild test -project ProjectName.xcodeproj -scheme SchemeName -destination 'platform=iOS Simulator,name=iPhone
6s,OS=9.2
' | xcpretty -s
-
xcodebuild test -project ProjectName.xcodeproj -scheme SchemeName -destination 'platform=iOS Simulator,name=iPhone
8,OS=11.3
' | xcpretty -s
tags
:
tags
:
-
ios_
9-2
-
ios_
11-3
-
xcode_
7-2
-
xcode_
9-3
-
osx_10-11
-
macos_10-13
archive_project
:
archive_project
:
stage
:
archive
stage
:
archive
...
@@ -25,6 +25,6 @@ archive_project:
...
@@ -25,6 +25,6 @@ archive_project:
paths
:
paths
:
-
build/ProjectName.ipa
-
build/ProjectName.ipa
tags
:
tags
:
-
ios_
9-2
-
ios_
11-3
-
xcode_
7-2
-
xcode_
9-3
-
osx_10-11
-
macos_10-13
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment