Skip to content

Commit

Permalink
Merge branch 'main' into cli-plugin-update
Browse files Browse the repository at this point in the history
  • Loading branch information
calvincestari committed Jan 12, 2024
2 parents d986607 + e0eec54 commit e561e2f
Show file tree
Hide file tree
Showing 163 changed files with 5,104 additions and 3,710 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2.1

orbs:
secops: apollo/circleci-secops-orb@2.0.2
secops: apollo/circleci-secops-orb@2.0.5

workflows:
security-scans:
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,24 @@ jobs:
shell: bash
run: |
./scripts/run-test-codegen-configurations.sh -t
verify-frontend-bundle-latest:
runs-on: macos-13
needs: [changes]
if: ${{ needs.changes.outputs.codegen == 'true' }}
timeout-minutes: 5
name: Verify Frontend Bundle Latest - macOS
steps:
- name: Checkout Repo
uses: actions/checkout@v3
- name: Build JS Bundle
shell: bash
working-directory: apollo-ios-codegen/Sources/GraphQLCompiler/JavaScript
run: npm install && ./auto_rollup.sh
- name: Verify Latest
shell: bash
run: |
git diff --exit-code
run-cocoapods-integration-tests:
runs-on: macos-13
Expand Down
2 changes: 1 addition & 1 deletion .tuist-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.19.0
3.35.5
3 changes: 2 additions & 1 deletion Configuration/Shared/Workspace-Target-Framework.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ FRAMEWORK_VERSION[sdk=macosx*] = A

APPLICATION_EXTENSION_API_ONLY = YES

DEFINES_MODULE = YES
DEFINES_MODULE = NO

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public struct WarmBloodedDetails: AnimalKingdomAPI.SelectionSet, Fragment {
] }

public var bodyTemperature: Int { __data["bodyTemperature"] }
public var height: HeightInMeters.Height { __data["height"] }
public var height: Height { __data["height"] }

public struct Fragments: FragmentContainer {
public let __data: DataDict
Expand All @@ -31,7 +31,7 @@ public struct WarmBloodedDetails: AnimalKingdomAPI.SelectionSet, Fragment {
public init(
__typename: String,
bodyTemperature: Int,
height: HeightInMeters.Height
height: Height
) {
self.init(_dataDict: DataDict(
data: [
Expand All @@ -45,4 +45,6 @@ public struct WarmBloodedDetails: AnimalKingdomAPI.SelectionSet, Fragment {
]
))
}

public typealias Height = HeightInMeters.Height
}

This file was deleted.

0 comments on commit e561e2f

Please sign in to comment.