Skip to content

Commit

Permalink
Improve log formatting (#1088)
Browse files Browse the repository at this point in the history
  • Loading branch information
defagos authored Dec 5, 2024
1 parent d9ff06f commit 34fe102
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nightlies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
Scripts/configure-environment.sh \
${{ secrets.APP_STORE_CONNECT_API_KEY }}
- name: Archive the demo
- name: Deliver the demo
run: |
make deliver-demo-nightly-${{ matrix.platform }}
env:
Expand Down
18 changes: 8 additions & 10 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,6 @@ jobs:
- name: Run the quality check
run: make check-quality

build-documentation:
name: 📚 Build documentation
runs-on: macos-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Build the documentation
run: make doc

tests:
name: 🧪 Tests
runs-on: macos-latest
Expand All @@ -40,6 +30,14 @@ jobs:
- name: Run tests
run: make test-${{ matrix.platform }}

- name: Publish report
uses: mikepenz/action-junit-report@v5
if: always()
with:
report_paths: 'fastlane/test_output/*.xml'
check_name: 📋 Unit test report (${{ matrix.platform }})
fail_on_failure: true

archive-demos:
name: 📦 Archives
runs-on: macos-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
Scripts/configure-environment.sh \
${{ secrets.APP_STORE_CONNECT_API_KEY }}
- name: Archive the demo
- name: Deliver the demo
run: |
make deliver-demo-release-${{ matrix.platform }}
env:
Expand Down
15 changes: 4 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ deliver-demo-nightly-tvos: install-pkgx install-bundler
@echo "... done.\n"

.PHONY: deliver-demo-release-ios
deliver-demo-release-ios: install-pkgx
deliver-demo-release-ios: install-pkgx install-bundler
@echo "Delivering demo release build for iOS..."
@bundle exec fastlane deliver_demo_release_ios
@pkgx bundle exec fastlane deliver_demo_release_ios
@echo "... done.\n"

.PHONY: deliver-demo-release-tvos
.PHONY: deliver-demo-release-tvos install-bundler
deliver-demo-release-tvos: install-pkgx
@echo "Delivering demo release build for tvOS..."
@bundle exec fastlane deliver_demo_release_tvos
@pkgx bundle exec fastlane deliver_demo_release_tvos
@echo "... done.\n"

.PHONY: test-streams-start
Expand Down Expand Up @@ -133,12 +133,6 @@ find-dead-code:
@pkgx periphery scan --project ./Demo/Pillarbox-demo.xcodeproj --schemes Pillarbox-demo --targets Pillarbox-demo --skip-build --index-store-path ./.build/derived-data/Index.noindex/DataStore/
@echo "... done.\n"

.PHONY: doc
doc: install-pkgx
@echo "Generating documentation sets..."
@pkgx fastlane doc
@echo "... done.\n"

.PHONY: help
help:
@echo "The following targets are available:"
Expand Down Expand Up @@ -171,6 +165,5 @@ help:
@echo " spm-reload Reload SPM dependencies"
@echo " clean-imports Remove useless imports from the project"
@echo " find-dead-code Find dead code"
@echo " doc Build the documentation"
@echo ""
@echo " help Display this help message"
3 changes: 3 additions & 0 deletions Scripts/fix-quality.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@

set -e

eval "$(pkgx --shellcode)"
env +swiftlint

swiftlint --fix && swiftlint
10 changes: 0 additions & 10 deletions Scripts/generate-documentation.sh

This file was deleted.

2 changes: 1 addition & 1 deletion Tests/CoreTests/SlicePublisherTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ final class SlicePublisherTests: XCTestCase {
Person(firstName: "Jane", lastName: "Smith"),
Person(firstName: "John", lastName: "Bridges")
].publisher.slice(at: \.firstName)
expectEqualPublished(values: ["Jane", "John"], from: publisher)
expectEqualPublished(values: ["Jane", "John"], from: publisher, during: .milliseconds(100))
}
}
11 changes: 6 additions & 5 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,14 @@ def run_package_tests(platform_id, scheme_name)
result_bundle: true,
number_of_retries: 3,
clean: true,
output_types: 'junit',
fail_build: false,
xcargs: '-testLanguage en -testRegion en_US'
)
trainer(
path: 'fastlane/test_output',
output_remove_retry_attempts: true
)
end

def run_all_tests(platform_id)
Expand Down Expand Up @@ -257,9 +263,4 @@ platform :ios do
lane :test_tvos do
run_all_tests(:tvos)
end

desc 'Build documentation'
lane :doc do
sh('../Scripts/generate-documentation.sh')
end
end

0 comments on commit 34fe102

Please sign in to comment.