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.

Sign up for GitHub

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

Switch to macos-latest runner #338

Closed
wants to merge 2 commits into from
Closed

Switch to macos-latest runner #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b751de2
release 6.1.2
vitaliy-pavlenko May 30, 2024
df09fe1
release 6.1.2
vitaliy-pavlenko May 30, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/release-cocoapods.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ on:
types: [ published ]

env:
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer

jobs:
release-cocoapods:
runs-on: macos-12
runs-on: macos-latest

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Ruby & Bundle setup
uses: ruby/setup-ruby@v1
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release-github.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ on:
- '[0-9]+.[0-9]+.[0-9]+-[a-z]+[0-9]+'

env:
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer

jobs:
test-and-release:
# Clone of main test workflow
runs-on: macos-12
runs-on: macos-latest

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Ruby & Bundle setup
uses: ruby/setup-ruby@v1
Expand Down Expand Up @@ -53,10 +53,10 @@ jobs:
bundle exec fastlane format_check

- name: Tests reports upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: tests-reports
name: tests-reports-${{ matrix.runs-on }}
path: "fastlane/test_output"

# Publish additional steps to test job
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test_0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ on:
workflow_dispatch:

env:
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer

jobs:
test:
runs-on: macos-12
runs-on: macos-latest

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Ruby & Bundle setup
uses: ruby/setup-ruby@v1
Expand Down Expand Up @@ -58,8 +58,8 @@ jobs:
bundle exec fastlane test_0

- name: Tests reports upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: tests-reports
name: tests-reports-${{ matrix.runs-on }}
path: "fastlane/test_output"
10 changes: 5 additions & 5 deletions .github/workflows/test_1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ on:
workflow_dispatch:

env:
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer

jobs:
test:
runs-on: macos-12
runs-on: macos-latest

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Ruby & Bundle setup
uses: ruby/setup-ruby@v1
Expand Down Expand Up @@ -58,8 +58,8 @@ jobs:
bundle exec fastlane test_1

- name: Tests reports upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: tests-reports
name: tests-reports-${{ matrix.runs-on }}
path: "fastlane/test_output"
10 changes: 5 additions & 5 deletions .github/workflows/test_2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ on:
workflow_dispatch:

env:
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer

jobs:
test:
runs-on: macos-12
runs-on: macos-latest

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Ruby & Bundle setup
uses: ruby/setup-ruby@v1
Expand Down Expand Up @@ -58,8 +58,8 @@ jobs:
bundle exec fastlane test_2

- name: Tests reports upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: failure()
with:
name: tests-reports
name: tests-reports-${{ matrix.runs-on }}
path: "fastlane/test_output"
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
# Criteo Publisher SDK Changelog
--------------------------------------------------------------------------------
## Version [6.1.2]

### Features
- Switch to macos-latest runner
- Update checkout and upload actions to v4
- Remove archs exclusion
- Fix tests

--------------------------------------------------------------------------------
## Version [6.1.1]

Expand Down
2 changes: 1 addition & 1 deletion CriteoAdViewer/Sources/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>6.1.1</string>
<string>6.1.2</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
Expand Down
2 changes: 1 addition & 1 deletion CriteoAdViewer/UITests/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>6.1.1</string>
<string>6.1.2</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion CriteoGoogleAdapter/Sources/CriteoGoogleAdapter/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>6.1.1</string>
<string>6.1.2</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion CriteoGoogleAdapter/Tests/CriteoGoogleAdapterTests/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>6.1.1</string>
<string>6.1.2</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
Expand Down
6 changes: 1 addition & 5 deletions CriteoPublisherSdk.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = "CriteoPublisherSdk"
spec.version = "6.1.1"
spec.version = "6.1.2-rc1"
spec.summary = "Criteo Publisher SDK for iOS"

spec.description = <<-DESC
Expand Down Expand Up @@ -39,10 +39,6 @@ Pod::Spec.new do |spec|
adapter.source_files = "CriteoGoogleAdapter/Sources/**/*.{h,m}"
adapter.dependency "CriteoPublisherSdk/Sdk"
adapter.dependency "Google-Mobile-Ads-SDK", "~> 10.1.0"

# Xcode 12 workaround: https://github.com/CocoaPods/CocoaPods/issues/10065
adapter.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64 arm64e armv7 armv7s i386', 'EXCLUDED_ARCHS[sdk=iphoneos*]' => 'i386 x86_64' }
adapter.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64 arm64e armv7 armv7s i386', 'EXCLUDED_ARCHS[sdk=iphoneos*]' => 'i386 x86_64' }
end


Expand Down
2 changes: 1 addition & 1 deletion CriteoPublisherSdk/Sources/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>6.1.1</string>
<string>6.1.2</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion CriteoPublisherSdk/Sources/Public/CRConstants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#ifndef CRConstants_h
#define CRConstants_h

#define CRITEO_PUBLISHER_SDK_VERSION @"6.1.1"
#define CRITEO_PUBLISHER_SDK_VERSION @"6.1.2-rc1"

#define CRITEO_DEFAULT_REQUEST_TIMEOUT_IN_SECONDS 60
#define CRITEO_DEFAULT_BID_TTL_IN_SECONDS 15 * 60
Expand Down
2 changes: 1 addition & 1 deletion CriteoPublisherSdk/Tests/CriteoPublisherSdkTests-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>6.1.1</string>
<string>6.1.2</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
Expand Down
5 changes: 1 addition & 4 deletions CriteoPublisherSdk/Tests/IntegrationTests/CRInterstitialDelegateTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,11 +739,8 @@ - (void)testInterstitialDidLoadForValidBid {
dependencyProvider.displaySizeInjector = displaySizeInjector;

WKWebView *mockWebView = OCMClassMock([WKWebView class]);
UIView *mockView = OCMClassMock([UIView class]);
CR_InterstitialViewController *interstitialVC =
[[CR_InterstitialViewController alloc] initWithWebView:mockWebView
view:mockView
interstitial:nil];
[[CR_InterstitialViewController alloc] initWithWebView:mockWebView view:nil interstitial:nil];
CRInterstitialAdUnit *adUnit1 = [[CRInterstitialAdUnit alloc] initWithAdUnitId:@"Yo"];
CRInterstitialAdUnit *adUnit2 = [[CRInterstitialAdUnit alloc] initWithAdUnitId:@"Yo"];
CRInterstitial *interstitial =
Expand Down
2 changes: 1 addition & 1 deletion CriteoPublisherSdk/Tests/UnitTests/Native/CRMediaViewTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ - (void)testSetMediaContent_GivenPlaceholderAndMultipleSuccessfulCall_SetPlaceho
#pragma mark - Private

- (UIImage *)imageWithWidth:(CGFloat)width {
return [UIImage imageWithSize:(CGSize){width, 0}];
return [UIImage imageWithSize:(CGSize){width, 1}];
}

- (CRMediaView *)buildMediaView {
Expand Down
2 changes: 1 addition & 1 deletion CriteoPublisherSdk/iTestHostApp/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>6.1.1</string>
<string>6.1.2</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSRequiresIPhoneOS</key>
Expand Down
Loading