Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⚙️ Fix GitHub actions #327

Merged
merged 3 commits into from
Feb 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@ on:
jobs:
swiftformat:
name: SwiftFormat
runs-on: macos-latest
runs-on: macos-13
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: swiftformat . --lint --quiet --reporter github-actions-log

swiftlint:
name: SwiftLint
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: swiftlint --strict --quiet --reporter github-actions-logging

install:
name: Install Script
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install Rugby
run: |
curl -Ls curl -Ls https://swiftyfinch.github.io/rugby/install.sh | bash
Expand All @@ -37,8 +37,8 @@ jobs:
name: Build Binary
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- uses: actions/cache@v3
- uses: actions/checkout@v4
- uses: actions/cache@v4
with:
path: .build
key: ${{ runner.os }}-spm-${{ hashFiles('Package.resolved') }}
Expand All @@ -55,9 +55,9 @@ jobs:
PROFDATA_FOLDER: .build/debug/codecov/default.profdata
IGNORE_FILENAME_REGEX: .build|Tests
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: brew install xcbeautify
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: .build
key: ${{ runner.os }}-spm-${{ hashFiles('Package.resolved') }}
Expand All @@ -73,7 +73,7 @@ jobs:
-format="lcov" \
--use-color
- name: Upload coverage reports to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

Expand All @@ -82,7 +82,7 @@ jobs:
RUGBY_PATH=`swift build --show-bin-path`/rugby
strip -rSTx $RUGBY_PATH
echo "RUGBY_PATH=$RUGBY_PATH" >> $GITHUB_ENV
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: rugby
path: ${{ env.RUGBY_PATH }}
Expand All @@ -92,13 +92,13 @@ jobs:
needs: tests
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- uses: actions/download-artifact@v3
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with: { name: rugby }
- run: chmod +x rugby && echo `pwd` >> $GITHUB_PATH
- run: rugby --version

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: Example/Pods
key: ${{ runner.os }}-pods-${{ hashFiles('Example/Podfile.lock') }}
Expand Down Expand Up @@ -130,13 +130,13 @@ jobs:
needs: tests
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- uses: actions/download-artifact@v3
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with: { name: rugby }
- run: chmod +x rugby && echo `pwd` >> $GITHUB_PATH
- run: rugby --version

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: Example/Pods
key: ${{ runner.os }}-pods-${{ hashFiles('Example/Podfile.lock') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: macos-latest
steps:
# Checkout with custom token for pushin to protected branch
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
token: ${{ secrets.CUSTOM_GITHUB_TOKEN }}

Expand Down
36 changes: 0 additions & 36 deletions Example/Example/Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@
230878282A8D3E3A00AEB6A7 /* Sources */,
230878292A8D3E3A00AEB6A7 /* Frameworks */,
2308782A2A8D3E3A00AEB6A7 /* Resources */,
D6FF114F4C4DB27F3E913981 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -252,7 +251,6 @@
2322FDE82AD4696D00F56303 /* Sources */,
2322FDEA2AD4696D00F56303 /* Frameworks */,
2322FDEC2AD4696D00F56303 /* Resources */,
70EACFF8425A8FB45710E1B7 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -417,23 +415,6 @@
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ExampleFrameworks/Pods-ExampleFrameworks-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
70EACFF8425A8FB45710E1B7 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-ExampleLibsTests/Pods-ExampleLibsTests-resources-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-ExampleLibsTests/Pods-ExampleLibsTests-resources-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ExampleLibsTests/Pods-ExampleLibsTests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
9FE67ADA4DDC9B3DCE39540B /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -495,23 +476,6 @@
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ExampleFrameworks/Pods-ExampleFrameworks-resources.sh\"\n";
showEnvVarsInLog = 0;
};
D6FF114F4C4DB27F3E913981 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-ExampleFrameworksTests/Pods-ExampleFrameworksTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-ExampleFrameworksTests/Pods-ExampleFrameworksTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ExampleFrameworksTests/Pods-ExampleFrameworksTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down
1 change: 0 additions & 1 deletion Example/Example/ExampleTests/ExampleTests.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Alamofire
import AutoMate
import KeyboardLayoutGuide
import Kingfisher
import Moya
Expand Down
2 changes: 0 additions & 2 deletions Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ target 'ExampleFrameworks' do

target 'ExampleFrameworksTests' do
inherit! :search_paths
pod 'AutoMate'
end
end

Expand All @@ -27,7 +26,6 @@ target 'ExampleLibs' do

target 'ExampleLibsTests' do
inherit! :search_paths
pod 'AutoMate'
end
end

Expand Down
8 changes: 2 additions & 6 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
PODS:
- Alamofire (5.8.0)
- AutoMate (1.8.0)
- "Keyboard+LayoutGuide (1.6.0)"
- Kingfisher (7.9.1)
- LocalPod (1.0.0):
Expand All @@ -14,7 +13,6 @@ PODS:
- SnapKit (5.6.0)

DEPENDENCIES:
- AutoMate
- "Keyboard+LayoutGuide"
- Kingfisher
- LocalPod (from `LocalPods`)
Expand All @@ -26,7 +24,6 @@ DEPENDENCIES:
SPEC REPOS:
trunk:
- Alamofire
- AutoMate
- "Keyboard+LayoutGuide"
- Kingfisher
- Moya
Expand All @@ -38,13 +35,12 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
Alamofire: 0e92e751b3e9e66d7982db43919d01f313b8eb91
AutoMate: e73f192ba530a60c01e1803f391f28bc154dd9ec
"Keyboard+LayoutGuide": db44b1764e2bb5d9824cc9cea9d9006cd4442045
Kingfisher: 1d14e9f59cbe19389f591c929000332bf70efd32
LocalPod: 98c9e510a9ffb889839862aafcde67a1bd2e503f
Moya: 138f0573e53411fb3dc17016add0b748dfbd78ee
SnapKit: e01d52ebb8ddbc333eefe2132acf85c8227d9c25

PODFILE CHECKSUM: 68b380e021774eb655075ed785b0db9f6d8d3a2e
PODFILE CHECKSUM: 7744094d93dba5bb608143d42834f7d636b428e3

COCOAPODS: 1.12.1
COCOAPODS: 1.14.3
Loading