From f892ab3041b6219d24c879c265a442d12933ebd7 Mon Sep 17 00:00:00 2001 From: Noah Martin Date: Mon, 14 Aug 2023 15:55:18 -0700 Subject: [PATCH] Master builds only --- .github/workflows/main.yml | 2 +- Rakefile | 6 +----- script/SizeTest/SizeTest/SceneDelegate.swift | 1 - 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4a73e8f4c8..aee6c6e745 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,7 +4,7 @@ on: push: branches: [ master ] pull_request: - branches: [ master, reset ] + branches: [ master ] jobs: build-package-macos-12: diff --git a/Rakefile b/Rakefile index 6b878f29d3..4ec869f7e3 100644 --- a/Rakefile +++ b/Rakefile @@ -162,11 +162,7 @@ namespace :emerge do } if ENV["PR_NUMBER"] != "" && ENV["PR_NUMBER"] != "false" # TODO: Enable PR uploads - # return - upload_data[:sha] = g.log[0].parents[1].sha - upload_data[:baseSha] = g.log[0].parent.sha - upload_data[:prNumber] = ENV["PR_NUMBER"] - upload_data[:buildType] = 'pull_request' + return else upload_data[:sha] = g.log[0].sha upload_data[:buildType] = 'master' diff --git a/script/SizeTest/SizeTest/SceneDelegate.swift b/script/SizeTest/SizeTest/SceneDelegate.swift index fae0f85e5b..36ae305ba5 100644 --- a/script/SizeTest/SizeTest/SceneDelegate.swift +++ b/script/SizeTest/SizeTest/SceneDelegate.swift @@ -15,7 +15,6 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`. // If using a storyboard, the `window` property will automatically be initialized and attached to the scene. // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead). - guard let _ = (scene as? UIWindowScene) else { return } } func sceneDidDisconnect(_: UIScene) {