Skip to content

Commit 6b83858

Browse files
committed
suggested changes made.
1 parent baccced commit 6b83858

File tree

6 files changed

+22
-44
lines changed

6 files changed

+22
-44
lines changed

.github/workflows/integration_tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ jobs:
2323
if: ${{ github.event_name == 'pull_request' }}
2424
run: |
2525
echo "SDK_BRANCH=${{ github.head_ref }}" >> $GITHUB_ENV
26-
echo "TRAVIS_BRANCH=${{ github.base_ref }}" >> $GITHUB_ENV
2726
- name: set SDK Branch if not pull request
2827
if: ${{ github.event_name != 'pull_request' }}
2928
run: |

.github/workflows/prepare_for_release.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

.github/workflows/swift.yml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,27 @@ jobs:
5050
uses: optimizely/swift-sdk/.github/workflows/unit_tests.yml@yasir/gitAction
5151

5252
prepare_for_release:
53+
runs-on: macos-latest
5354
if: "${{ github.event.inputs.PREP == 'true' && github.event_name == 'workflow_dispatch' }}"
54-
uses: optimizely/swift-sdk/.github/workflows/prepare_for_release.yml@yasir/gitAction
55-
with:
56-
VERSION: 3.10.1 # env variables cannot be used for reusable workflows
57-
secrets:
58-
CI_USER_TOKEN: ${{ secrets.CI_USER_TOKEN }}
55+
steps:
56+
- uses: actions/checkout@v3
57+
- uses: maxim-lobanov/setup-xcode@v1
58+
with:
59+
xcode-version: '12.4'
60+
- id: prepare_for_release
61+
name: Prepare for release
62+
env:
63+
HOME: 'home/runner'
64+
REPO_SLUG: ${{ github.repository }}
65+
BRANCH: ${{ github.ref_name }}
66+
GITHUB_USER: optibot
67+
GITHUB_TOKEN: ${{ secrets.CI_USER_TOKEN }}
68+
run: |
69+
gem install cocoapods -v '1.9.3'
70+
Scripts/run_prep.sh
71+
- name: Check prepare for release failure
72+
if: steps.prepare_for_release.conclusion == 'failure'
73+
run: cat /tmp/build.out
5974

6075
release:
6176
if: "${{github.event.inputs.RELEASE == 'true' && github.event_name == 'workflow_dispatch' }}"

Scripts/build_all.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,3 @@ main() {
3535
}
3636

3737
main
38-

Scripts/prepare_coveralls_report.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
mkdir xccov2lcov && cd xccov2lcov && git init && git fetch --depth=1 https://github.com/trax-retail/xccov2lcov.git && git checkout FETCH_HEAD
1212
xcrun xccov view --report --json ../$COVERAGE_DIR/Logs/Test/*.xcresult > coverage.json
1313
swift run xccov2lcov coverage.json > lcov.info
14-
cd ..
14+
cd ..

Scripts/test_all.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ for i in "${!deviceModels[@]}"; do
1919
Scripts/prepare_simulator.sh
2020
echo "Testing OptimizelySwiftSDK-${platforms[$i]} (${deviceModels[$i]},OS=${osVersions[$i]})"
2121
xcrun xcodebuild -workspace OptimizelySwiftSDK.xcworkspace -scheme "OptimizelySwiftSDK-${platforms[$i]}" -sdk "${testSdks[$i]}" -destination "platform=${platforms[$i]} Simulator,name=${deviceModels[$i]},OS=${osVersions[$i]}" test
22-
done
22+
done

0 commit comments

Comments
 (0)