Skip to content

Commit

Permalink
Adjusts to merge forward
Browse files Browse the repository at this point in the history
  • Loading branch information
keelerm84 committed Jan 2, 2024
1 parent 96ecdd0 commit 24a3a8a
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/actions/ci/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@ runs:
shell: bash
# Add a brief sleep here to ensure the test service is ready to receive
# requests
run: sleep 5 && make run-contract-tests
run: sleep 10 && make run-contract-tests
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
**Requirements**

- [ ] I have added test coverage for new or changed functionality
- [ ] I have followed the repository's [pull request submission guidelines](../blob/v8/CONTRIBUTING.md#submitting-pull-requests)
- [ ] I have followed the repository's [pull request submission guidelines](../blob/v9/CONTRIBUTING.md#submitting-pull-requests)
- [ ] I have validated my changes against all supported platform versions

**Related issues**
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: Run CI
on:
push:
branches: [ v8 ]
branches: [ v9 ]
paths-ignore:
- '**.md' # Do not need to run CI for markdown changes.
pull_request:
branches: [ v8 ]
branches: [ v9 ]
paths-ignore:
- '**.md'

Expand All @@ -16,6 +16,9 @@ jobs:
strategy:
matrix:
include:
- xcode-version: 15.0.1
ios-sim: 'platform=iOS Simulator,name=iPhone 15,OS=17.2'
os: macos-13
- xcode-version: 14.3.1
ios-sim: 'platform=iOS Simulator,name=iPhone 14,OS=16.4'
os: macos-13
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Run Release Please
on:
push:
branches:
- v8
- v9

jobs:
release-package:
Expand Down
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "8.3.1"
".": "9.2.1"
}
1 change: 0 additions & 1 deletion ContractTests/Source/Controllers/SdkController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ final class SdkController: RouteCollection {
"strongly-typed",
"tags",
"auto-env-attributes",
"user-type",
"context-comparison",
"etag-caching"
]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Foundation

struct ReportingConsts {
static let sdkVersion = "9.2.1"
static let sdkVersion = "9.2.1" // x-release-please-version
static let sdkName = "ios-client-sdk"
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
LaunchDarkly SDK for iOS
========================

[![Run CI](https://github.com/launchdarkly/ios-client-sdk/actions/workflows/ci.yml/badge.svg?branch=v8)](https://github.com/launchdarkly/ios-client-sdk/actions/workflows/ci.yml)
[![Run CI](https://github.com/launchdarkly/ios-client-sdk/actions/workflows/ci.yml/badge.svg?branch=v9)](https://github.com/launchdarkly/ios-client-sdk/actions/workflows/ci.yml)
[![SwiftPM compatible](https://img.shields.io/badge/SwiftPM-compatible-4BC51D.svg?style=flat)](https://swift.org/package-manager/)
[![CocoaPods compatible](https://img.shields.io/cocoapods/v/LaunchDarkly.svg)](https://cocoapods.org/pods/LaunchDarkly)
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
Expand Down
2 changes: 1 addition & 1 deletion release-please-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"include-component-in-tag": false,
"extra-files": [
"LaunchDarkly.podspec",
"LaunchDarkly/LaunchDarkly/ServiceObjects/EnvironmentReporter.swift",
"LaunchDarkly/LaunchDarkly/ServiceObjects/EnvironmentReporting/ReportingConsts.swift",
"README.md"
]
}
Expand Down

0 comments on commit 24a3a8a

Please sign in to comment.