Skip to content

Commit 11df1d5

Browse files
p4checomluisbrown
authored andcommitted
Fix Package.swift and release CI jobs
Explicitly add ReactiveSwift to the `ComposableArchitecture` target instead of being transitive from `Dependencies`. Fix documentation CI job to use `master` ref instead of `main`. Fix format CI job to remove credentials related configs as `master` branch protections have been lifted.
1 parent 10c1648 commit 11df1d5

File tree

4 files changed

+87
-92
lines changed

4 files changed

+87
-92
lines changed

.github/workflows/documentation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ jobs:
3030
- name: Build documentation
3131
run: >
3232
rm -rf docs-out/.git;
33-
rm -rf docs-out/main;
33+
rm -rf docs-out/master;
3434
git tag -l --sort=-v:refname | grep -e "\d\+\.\d\+.0" | tail -n +6 | xargs -I {} rm -rf {};
3535
36-
for tag in $(echo "main"; git tag -l --sort=-v:refname | grep -e "\d\+\.\d\+.0" | head -6);
36+
for tag in $(echo "master"; git tag -l --sort=-v:refname | grep -e "\d\+\.\d\+.0" | head -6);
3737
do
3838
if [ -d "docs-out/$tag/data/documentation/composablearchitecture" ]
3939
then

.github/workflows/format.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ jobs:
1515
runs-on: macos-12
1616
steps:
1717
- uses: actions/checkout@v3
18-
with:
19-
persist-credentials: false
2018
- name: Xcode Select
2119
run: sudo xcode-select -s /Applications/Xcode_14.1.app
2220
- name: Tap
@@ -29,5 +27,3 @@ jobs:
2927
with:
3028
commit_message: Run swift-format
3129
branch: 'master'
32-
env:
33-
GITHUB_TOKEN: ${{ secrets.FORMAT_TOKEN }}

Package.resolved

Lines changed: 83 additions & 85 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ let package = Package(
3737
.product(name: "CasePaths", package: "swift-case-paths"),
3838
.product(name: "CustomDump", package: "swift-custom-dump"),
3939
.product(name: "IdentifiedCollections", package: "swift-identified-collections"),
40+
.product(name: "ReactiveSwift", package: "ReactiveSwift"),
4041
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
4142
]
4243
),
@@ -49,7 +50,7 @@ let package = Package(
4950
.target(
5051
name: "Dependencies",
5152
dependencies: [
52-
"ReactiveSwift",
53+
.product(name: "ReactiveSwift", package: "ReactiveSwift"),
5354
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
5455
]
5556
),

0 commit comments

Comments
 (0)