From e7573039c99195a4c42b7ce293122e9e904202e2 Mon Sep 17 00:00:00 2001 From: Alex Moinet Date: Mon, 9 Oct 2023 17:10:15 +0100 Subject: [PATCH] Update workflow and makefile to work when updating build version number --- .github/workflows/update-dependencies.yml | 2 +- Gemfile | 4 +- Gemfile.lock | 124 +++++++++++++++++++++- Makefile | 2 +- 4 files changed, 124 insertions(+), 8 deletions(-) diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml index a873d3bf6..eec6d6c29 100644 --- a/.github/workflows/update-dependencies.yml +++ b/.github/workflows/update-dependencies.yml @@ -43,6 +43,6 @@ jobs: run: > gh pr create -B dep-updater -H bumpsnag-$TARGET_SUBMODULE-$TARGET_VERSION - --title "Update $(TARGET_SUBMODULE) to version $(TARGET_VERSION)" + --title "Update $TARGET_SUBMODULE to version $TARGET_VERSION" --body 'Created by bumpsnag' --reviewer cawllec diff --git a/Gemfile b/Gemfile index f7de106fe..1d6515025 100644 --- a/Gemfile +++ b/Gemfile @@ -4,11 +4,11 @@ gem 'rake' gem 'xcpretty' gem 'xcodeproj' -gem 'bumpsnag', git: 'https://github.com/bugsnag/platforms-bumpsnag', branch: 'initial-release' +gem 'bumpsnag', git: 'https://github.com/bugsnag/platforms-bumpsnag', branch: 'main' unless Gem.win_platform? # Use official Maze Runner release - # gem 'bugsnag-maze-runner', '~>8.0' + gem 'bugsnag-maze-runner', '~>8.0' # Use a specific Maze Runner branch # gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', branch: 'master' diff --git a/Gemfile.lock b/Gemfile.lock index e8fd85b01..e40af2152 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/bugsnag/platforms-bumpsnag - revision: 0454e1726b283f6f32c8d31b08d6b1659d792417 - branch: initial-release + revision: 6c841f3e065584b7e3fb370229d58493e55555fc + branch: main specs: bumpsnag (0.1.0) @@ -10,13 +10,128 @@ GEM specs: CFPropertyList (3.0.6) rexml + appium_lib (12.0.1) + appium_lib_core (~> 5.0) + nokogiri (~> 1.8, >= 1.8.1) + tomlrb (>= 1.1, < 3.0) + appium_lib_core (5.4.0) + faye-websocket (~> 0.11.0) + selenium-webdriver (~> 4.2, < 4.6) atomos (0.1.3) + bugsnag (6.26.0) + concurrent-ruby (~> 1.0) + bugsnag-maze-runner (8.7.1) + appium_lib (~> 12.0.0) + appium_lib_core (~> 5.4.0) + bugsnag (~> 6.24) + cucumber (~> 7.1) + cucumber-expressions (~> 6.0.0) + curb (~> 0.9.6) + dogstatsd-ruby (~> 5.5.0) + json_schemer (~> 0.2.24) + optimist (~> 3.0.1) + os (~> 1.0.0) + rack (~> 2.2) + rake (~> 12.3.3) + rubyzip (~> 2.3.2) + selenium-webdriver (~> 4.0) + test-unit (~> 3.5.2) + webrick (~> 1.7.0) + builder (3.2.4) + childprocess (4.1.0) claide (1.1.0) colored2 (3.1.2) + concurrent-ruby (1.2.2) + cucumber (7.1.0) + builder (~> 3.2, >= 3.2.4) + cucumber-core (~> 10.1, >= 10.1.0) + cucumber-create-meta (~> 6.0, >= 6.0.1) + cucumber-cucumber-expressions (~> 14.0, >= 14.0.0) + cucumber-gherkin (~> 22.0, >= 22.0.0) + cucumber-html-formatter (~> 17.0, >= 17.0.0) + cucumber-messages (~> 17.1, >= 17.1.1) + cucumber-wire (~> 6.2, >= 6.2.0) + diff-lcs (~> 1.4, >= 1.4.4) + mime-types (~> 3.3, >= 3.3.1) + multi_test (~> 0.1, >= 0.1.2) + sys-uname (~> 1.2, >= 1.2.2) + cucumber-core (10.1.1) + cucumber-gherkin (~> 22.0, >= 22.0.0) + cucumber-messages (~> 17.1, >= 17.1.1) + cucumber-tag-expressions (~> 4.1, >= 4.1.0) + cucumber-create-meta (6.0.4) + cucumber-messages (~> 17.1, >= 17.1.1) + sys-uname (~> 1.2, >= 1.2.2) + cucumber-cucumber-expressions (14.0.0) + cucumber-expressions (6.0.1) + cucumber-gherkin (22.0.0) + cucumber-messages (~> 17.1, >= 17.1.1) + cucumber-html-formatter (17.0.0) + cucumber-messages (~> 17.1, >= 17.1.0) + cucumber-messages (17.1.1) + cucumber-tag-expressions (4.1.0) + cucumber-wire (6.2.1) + cucumber-core (~> 10.1, >= 10.1.0) + cucumber-cucumber-expressions (~> 14.0, >= 14.0.0) + curb (0.9.11) + diff-lcs (1.5.0) + dogstatsd-ruby (5.5.0) + ecma-re-validator (0.4.0) + regexp_parser (~> 2.2) + eventmachine (1.2.7) + faye-websocket (0.11.3) + eventmachine (>= 0.12.0) + websocket-driver (>= 0.5.1) + ffi (1.16.3) + hana (1.3.7) + json_schemer (0.2.25) + ecma-re-validator (~> 0.3) + hana (~> 1.3) + regexp_parser (~> 2.0) + simpleidn (~> 0.2) + uri_template (~> 0.7) + mime-types (3.5.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2023.1003) + mini_portile2 (2.8.4) + multi_test (0.1.2) nanaimo (0.3.0) - rake (13.0.6) + nokogiri (1.15.4) + mini_portile2 (~> 2.8.2) + racc (~> 1.4) + nokogiri (1.15.4-x86_64-darwin) + racc (~> 1.4) + optimist (3.0.1) + os (1.0.1) + power_assert (2.0.3) + racc (1.7.1) + rack (2.2.8) + rake (12.3.3) + regexp_parser (2.8.1) rexml (3.2.6) rouge (2.0.7) + rubyzip (2.3.2) + selenium-webdriver (4.5.0) + childprocess (>= 0.5, < 5.0) + rexml (~> 3.2, >= 3.2.5) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) + simpleidn (0.2.1) + unf (~> 0.1.4) + sys-uname (1.2.3) + ffi (~> 1.1) + test-unit (3.5.9) + power_assert + tomlrb (2.0.3) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.2) + uri_template (0.7.0) + webrick (1.7.0) + websocket (1.2.10) + websocket-driver (0.7.6) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) xcodeproj (1.23.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) @@ -28,9 +143,10 @@ GEM rouge (~> 2.0.7) PLATFORMS - ruby + x86_64-darwin-19 DEPENDENCIES + bugsnag-maze-runner (~> 8.0) bumpsnag! rake xcodeproj diff --git a/Makefile b/Makefile index 3ceaf452d..f15b53e9e 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ bump_cake: ifeq ($(VERSION),) @$(error VERSION is not defined. Run with `make VERSION=number bump_cake`) endif -ifeq ($(OSTYPE), $(wildcard darwin*)) +ifeq ($(shell uname),Darwin) @sed -i '' "s/^var version = \".*\";/var version = \"$(VERSION)\";/" build.cake else @sed -i "s/^var version = \".*\";/var version = \"$(VERSION)\";/" build.cake