Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feature/file-resources
# Conflicts: # .swiftpm/xcode/xcshareddata/xcschemes/swiftgen.xcscheme # Sources/SwiftGenCLI/templates/files/flat-swift4.stencil # Sources/SwiftGenCLI/templates/files/flat-swift5.stencil # Sources/SwiftGenCLI/templates/files/structured-swift4.stencil # Sources/SwiftGenCLI/templates/files/structured-swift5.stencil # Sources/TestUtils/TestsHelper+Context.swift # SwiftGen.xcodeproj/project.pbxproj # Tests/TemplatesTests/TestsHelper.swift
- Loading branch information
Showing
979 changed files
with
1,788 additions
and
38,951 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
|
||
# Mark some files as being "Generated" so they are not loaded by default in GitHub PRs | ||
/Tests/Fixtures/Generated/** linguist-generated | ||
/Tests/Fixtures/StencilContexts/** linguist-generated | ||
/Tests/Fixtures/Generated/**/compilation-configuration.yml -linguist-generated | ||
/Sources/TestUtils/Fixtures/Generated/** linguist-generated | ||
/Sources/TestUtils/Fixtures/StencilContexts/** linguist-generated | ||
/Sources/TestUtils/Fixtures/Generated/**/compilation-configuration.yml -linguist-generated | ||
|
||
# Mark some files which are not really part of SwiftGen's codebase as "not detectable by linguist", so they are not counted in the repo's languages stats | ||
Rakefile -linguist-detectable | ||
rakelib/** -linguist-detectable | ||
/Scripts/** -linguist-detectable | ||
/Tests/Fixtures/** -linguist-detectable | ||
/Sources/TestUtils/Fixtures/** -linguist-detectable |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
version: 2 | ||
updates: | ||
# Maintain dependencies for GitHub Actions | ||
- package-ecosystem: "github-actions" | ||
directory: "/" | ||
schedule: | ||
interval: "daily" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
name: Archive | ||
|
||
on: | ||
push: | ||
branches: stable | ||
pull_request: | ||
|
||
jobs: | ||
install: | ||
name: Install | ||
runs-on: macos-latest | ||
steps: | ||
- | ||
name: Checkout | ||
uses: actions/checkout@v2 | ||
- | ||
name: Setup Ruby | ||
uses: ruby/setup-ruby@v1 | ||
with: | ||
bundler-cache: true | ||
- | ||
name: Cache SPM | ||
uses: actions/cache@v2 | ||
with: | ||
path: .build | ||
key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }} | ||
restore-keys: | | ||
${{ runner.os }}-spm- | ||
- | ||
name: Verify installation | ||
run: bundle exec rake cli:install[./standalone,./standalone/frameworks,./standalone/stencils] | ||
- | ||
name: Check swiftgen binary | ||
run: | | ||
./standalone/swiftgen --version | ||
./standalone/swiftgen templates list | ||
zip: | ||
name: Zip | ||
runs-on: macos-latest | ||
steps: | ||
- | ||
name: Checkout | ||
uses: actions/checkout@v2 | ||
- | ||
name: Setup Ruby | ||
uses: ruby/setup-ruby@v1 | ||
with: | ||
bundler-cache: true | ||
- | ||
name: Cache SPM | ||
uses: actions/cache@v2 | ||
with: | ||
path: .build | ||
key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }} | ||
restore-keys: | | ||
${{ runner.os }}-spm- | ||
- | ||
name: Create zip | ||
run: bundle exec rake release:zip | ||
- | ||
name: Upload artifact | ||
uses: actions/upload-artifact@v2 | ||
with: | ||
name: SwiftGen.zip | ||
path: .build/swiftgen-*.zip |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
name: Cocoapods | ||
|
||
on: | ||
push: | ||
branches: stable | ||
pull_request: | ||
|
||
jobs: | ||
lint: | ||
name: Pod Lint | ||
runs-on: ubuntu-latest | ||
steps: | ||
- | ||
name: Checkout | ||
uses: actions/checkout@v2 | ||
- | ||
name: Setup Ruby | ||
uses: ruby/setup-ruby@v1 | ||
with: | ||
bundler-cache: true | ||
- | ||
name: Lint podspec | ||
run: bundle exec rake pod:lint |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
name: Output | ||
|
||
on: | ||
push: | ||
branches: stable | ||
pull_request: | ||
|
||
jobs: | ||
compile: | ||
name: Compile Output | ||
runs-on: macos-latest | ||
steps: | ||
- | ||
name: Checkout | ||
uses: actions/checkout@v2 | ||
- | ||
name: Setup Ruby | ||
uses: ruby/setup-ruby@v1 | ||
with: | ||
bundler-cache: true | ||
- | ||
name: Run tests | ||
run: bundle exec rake output:compile |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
name: Danger | ||
|
||
on: | ||
push: | ||
branches: stable | ||
pull_request: | ||
|
||
jobs: | ||
check: | ||
name: Danger Check | ||
runs-on: ubuntu-latest | ||
steps: | ||
- | ||
name: Checkout | ||
uses: actions/checkout@v2 | ||
- | ||
name: Setup Ruby | ||
uses: ruby/setup-ruby@v1 | ||
with: | ||
bundler-cache: true | ||
- | ||
name: Run Danger | ||
run: bundle exec danger --verbose | ||
env: | ||
DANGER_GITHUB_API_TOKEN: ${{ secrets.danger_github_api_token }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
name: SwiftLint | ||
|
||
on: | ||
push: | ||
branches: stable | ||
pull_request: | ||
|
||
jobs: | ||
lint: | ||
name: SwiftLint | ||
runs-on: macos-latest | ||
steps: | ||
- | ||
name: Checkout | ||
uses: actions/checkout@v2 | ||
- | ||
name: Setup Ruby | ||
uses: ruby/setup-ruby@v1 | ||
with: | ||
bundler-cache: true | ||
- | ||
name: Lint source code | ||
run: bundle exec rake lint:code | ||
- | ||
name: Lint tests source code | ||
run: bundle exec rake lint:tests | ||
- | ||
name: Lint generated output code | ||
run: bundle exec rake lint:output |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
name: Test SPM | ||
|
||
on: | ||
push: | ||
branches: stable | ||
pull_request: | ||
|
||
jobs: | ||
macos: | ||
name: Test SPM macOS | ||
runs-on: macos-latest | ||
steps: | ||
- | ||
name: Checkout | ||
uses: actions/checkout@v2 | ||
- | ||
name: Setup Ruby | ||
uses: ruby/setup-ruby@v1 | ||
with: | ||
bundler-cache: true | ||
- | ||
name: Cache SPM | ||
uses: actions/cache@v2 | ||
with: | ||
path: .build | ||
key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }} | ||
restore-keys: | | ||
${{ runner.os }}-spm- | ||
# TODO: This should run the tests once SPM supports testing an executable | ||
- | ||
name: Build | ||
run: bundle exec rake spm:test |
Oops, something went wrong.