From 36ef447303b627c3f622e62f919c1f40492fddc4 Mon Sep 17 00:00:00 2001 From: RevanToma <113920337+RevanToma@users.noreply.github.com> Date: Thu, 19 Sep 2024 01:43:15 -0700 Subject: [PATCH] added 1passowrd cli to eas-build yml (#131) --- .github/workflows/eas-build.yml | 26 ++++++++++++- .../push-apple/graphql/schema.generated.ts | 4 +- .../push-expo/graphql/schema.generated.ts | 39 ------------------- 3 files changed, 25 insertions(+), 44 deletions(-) diff --git a/.github/workflows/eas-build.yml b/.github/workflows/eas-build.yml index efa1a67f..a848b986 100644 --- a/.github/workflows/eas-build.yml +++ b/.github/workflows/eas-build.yml @@ -80,6 +80,10 @@ on: required: false type: string description: Set bun version + env_template_file: + type: string + description: The Path to the .env template file + required: true secrets: EXPO_TOKEN: description: The Expo token to use for publishing @@ -96,6 +100,9 @@ on: DISCORD_WEBHOOK: description: The Discord Webhook to use for notifications required: false + OP_SERVICE_ACCOUNT_TOKEN: + description: The 1Password service account token + required: true # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: @@ -120,6 +127,21 @@ jobs: - uses: actions/checkout@v4 if: ${{ !inputs.checkout_ref }} + - name: Install 1Password CLI + uses: 1password/install-cli-action@v1 + if: ${{ inputs.env_template_file }} + + - name: Load secret + uses: 1password/load-secrets-action/configure@v2 + if: ${{ inputs.env_template_file }} + env: + OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }} + + - name: Build .env.production + run: op inject -i ${{ inputs.env_template_file }}.tpl -o ${{ inputs.env_template_file }} + if: ${{ inputs.env_template_file }} + working-directory: ${{ inputs.working_directory }} + - uses: actions/checkout@v4 if: ${{ inputs.checkout_ref }} with: @@ -172,7 +194,7 @@ jobs: eas-version: latest packager: ${{ inputs.package_manager }} expo-cache: true # optional - + - name: Get Hash if: ${{ !inputs.always_run }} run: echo "HASH=`jq -r '.expo.${{ inputs.platform }}.runtimeVersion' app.json`" >> $GITHUB_ENV @@ -262,4 +284,4 @@ jobs: url: ${{ env.BUILD_URL }} - uses: rtCamp/action-slack-notify@v2 - if: ${{ failure() && env.SLACK_WEBHOOK }} \ No newline at end of file + if: ${{ failure() && env.SLACK_WEBHOOK }} diff --git a/packages/push-apple/graphql/schema.generated.ts b/packages/push-apple/graphql/schema.generated.ts index a47b4a6c..5438832b 100644 --- a/packages/push-apple/graphql/schema.generated.ts +++ b/packages/push-apple/graphql/schema.generated.ts @@ -16,7 +16,6 @@ export type Scalars = { Boolean: { input: boolean; output: boolean; } Int: { input: number; output: number; } Float: { input: number; output: number; } - /** The `JSONObject` scalar type represents JSON objects as specified by [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf). */ JSONObject: { input: any; output: any; } }; @@ -73,7 +72,6 @@ export type MutationRegisterAppleUpdateLiveActivityPushTokenArgs = { activityId: Scalars['ID']['input']; appBundleId: Scalars['String']['input']; isSandbox?: InputMaybe; - liveActivityAttributes: Scalars['JSONObject']['input']; liveActivityType: Scalars['String']['input']; token: Scalars['String']['input']; }; @@ -218,7 +216,7 @@ export type MutationResolvers>; registerApplePushToken?: Resolver>; registerAppleStartLiveActivityPushToken?: Resolver>; - registerAppleUpdateLiveActivityPushToken?: Resolver>; + registerAppleUpdateLiveActivityPushToken?: Resolver>; sendPushNotification?: Resolver>; sendSilentPushNotification?: Resolver>; startLiveActivity?: Resolver>; diff --git a/packages/push-expo/graphql/schema.generated.ts b/packages/push-expo/graphql/schema.generated.ts index 80fa579e..7f953ed7 100644 --- a/packages/push-expo/graphql/schema.generated.ts +++ b/packages/push-expo/graphql/schema.generated.ts @@ -26,7 +26,6 @@ export enum ExpoPushPlatform { export type Mutation = { readonly __typename?: 'Mutation'; - readonly randomNumber: Scalars['Int']['output']; readonly registerExpoPushToken: Scalars['Boolean']['output']; readonly sendPushNotification: Scalars['Boolean']['output']; }; @@ -44,23 +43,6 @@ export type MutationSendPushNotificationArgs = { title: Scalars['String']['input']; }; -export type Query = { - readonly __typename?: 'Query'; - readonly hello: Scalars['String']['output']; -}; - -export type Subscription = { - readonly __typename?: 'Subscription'; - readonly countdown: Scalars['Int']['output']; - readonly randomNumber: Scalars['Int']['output']; - readonly tick: Scalars['Float']['output']; -}; - - -export type SubscriptionCountdownArgs = { - from: Scalars['Int']['input']; -}; - export type WithIndex = TObject & Record; export type ResolversObject = WithIndex; @@ -135,44 +117,23 @@ export type DirectiveResolverFn; ExpoPushPlatform: ExpoPushPlatform; - Float: ResolverTypeWrapper; - Int: ResolverTypeWrapper; Mutation: ResolverTypeWrapper<{}>; - Query: ResolverTypeWrapper<{}>; String: ResolverTypeWrapper; - Subscription: ResolverTypeWrapper<{}>; }>; /** Mapping between all available schema types and the resolvers parents */ export type ResolversParentTypes = ResolversObject<{ Boolean: Scalars['Boolean']['output']; - Float: Scalars['Float']['output']; - Int: Scalars['Int']['output']; Mutation: {}; - Query: {}; String: Scalars['String']['output']; - Subscription: {}; }>; export type MutationResolvers = ResolversObject<{ - randomNumber?: Resolver; registerExpoPushToken?: Resolver>; sendPushNotification?: Resolver>; }>; -export type QueryResolvers = ResolversObject<{ - hello?: Resolver; -}>; - -export type SubscriptionResolvers = ResolversObject<{ - countdown?: SubscriptionResolver>; - randomNumber?: SubscriptionResolver; - tick?: SubscriptionResolver; -}>; - export type Resolvers = ResolversObject<{ Mutation?: MutationResolvers; - Query?: QueryResolvers; - Subscription?: SubscriptionResolvers; }>;