Skip to content

Commit

Permalink
fixes to release scripts (#108)
Browse files Browse the repository at this point in the history
* fixed integration tests
* select newer Xcode for the release build
* attempt to fix release script
  • Loading branch information
ypopovych authored Aug 7, 2024
1 parent f247ef3 commit 1456c88
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/createRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Select Xcode 14
run: sudo xcode-select --switch /Applications/Xcode_14.1.app
run: sudo xcode-select --switch /Applications/Xcode_14.3.1.app
- name: Test
run: make XC_LOG=tests tests
- name: Attach Xcode logs
Expand All @@ -29,10 +29,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Select Xcode 14
run: sudo xcode-select --switch /Applications/Xcode_14.1.app
run: sudo xcode-select --switch /Applications/Xcode_14.3.1.app
- name: Build and upload XCFrameworks, recreate tag
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: make XC_LOG=archive version=${{ github.event.release.tag_name }} github
- name: Attach Xcode logs
if: '!cancelled()'
Expand Down
1 change: 0 additions & 1 deletion IntegrationTests/UITests/IntegrationTestsRunner.swift
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ class IntegrationTestsRunner: XCTestCase {
}

func validateGenericAttributes() {
XCTAssertEqual(attrib[DDGenericTags.language], "swift")
XCTAssertEqual(attrib[DDGenericTags.type], "test")
XCTAssertEqual(attrib[DDTestTags.testModule], "IntegrationTestsApp")
XCTAssertEqual(attrib[DDTestTags.testFramework], "XCTest")
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,12 @@ github: release
@:$(call check_defined, GITHUB_TOKEN, GitHub token)
# Upload binary file to GitHub release
brew list gh &>/dev/null || brew install gh
@echo $(GITHUB_TOKEN) | gh auth login --with-token
gh auth login
# upload xcframework
gh release upload $(version) ./build/xcframework/DatadogSDKTesting.zip --clobber
# upload symbols
rm -f build/symbols/DatadogSDKTesting.symbols.zip
mv build/symbols/DatadogSDKTesting.zip build/symbols/DatadogSDKTesting.symbols.zip
@rm -f build/symbols/DatadogSDKTesting.symbols.zip
@mv build/symbols/DatadogSDKTesting.zip build/symbols/DatadogSDKTesting.symbols.zip
gh release upload $(version) ./build/symbols/DatadogSDKTesting.symbols.zip --clobber
# Commit updated xcodeproj, Package.swift and DatadogSDKTesting.podspec
git add Package.swift DatadogSDKTesting.podspec DatadogSDKTesting.xcodeproj/project.pbxproj
Expand Down

0 comments on commit 1456c88

Please sign in to comment.