Skip to content

Commit

Permalink
Seperate bundle install from ruby install
Browse files Browse the repository at this point in the history
  • Loading branch information
Cawllec committed Oct 10, 2023
1 parent 0cc8a45 commit 6d6cdb1
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 26 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/update-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ jobs:
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
bundler-cache: true

- name: Install dependencies
run: bundle install

- run: bundle exec rake dependencies:update

Expand Down
8 changes: 0 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
GIT
remote: https://github.com/bugsnag/platforms-bumpsnag
revision: 6c841f3e065584b7e3fb370229d58493e55555fc
branch: main
specs:
bumpsnag (0.1.0)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -148,7 +141,6 @@ PLATFORMS

DEPENDENCIES
bugsnag-maze-runner (~> 8.0)
bumpsnag!
rake
xcodeproj
xcpretty
Expand Down
12 changes: 1 addition & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,4 @@ ifeq ($(VERSION),)
endif
@echo Bumping the version number to $(VERSION)
@sed -i '' "s/## TBD/## $(VERSION) ($(shell date '+%Y-%m-%d'))/" CHANGELOG.md
@sed -i '' "s/^var version = \".*\";/var version = \"$(VERSION)\";/" build.cake

bump_cake:
ifeq ($(VERSION),)
@$(error VERSION is not defined. Run with `make VERSION=number bump_cake`)
endif
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
endif
@sed -i '' "s/^var version = \".*\";/var version = \"$(VERSION)\";/" build.cake
8 changes: 2 additions & 6 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -465,20 +465,16 @@ namespace :dependencies do

if updated
current_version = local_info[:parsed_latest_release]
release_version = "#{current_version[:major]}.#{current_version[:minor] + 1}.0"

`VERSION=#{release_version} make bump_cake`

target_pr = local_info[:latest_pr] + 1
origin_repo = local_info[:github_url]
message = "Updated submodule: #{target_submodule} to release version: v#{release_version} [##{target_pr}](#{origin_repo}/pull/#{target_pr})"
message = "Updated submodule: #{target_submodule} to release version: v#{target_version} [##{target_pr}](#{origin_repo}/pull/#{target_pr})"

Bumpsnag.add_changelog_entry(message)

release_branch = "bumpsnag-#{target_submodule}-#{target_version}"

Bumpsnag.change_branch(release_branch, true)
Bumpsnag.commit_changes(message, "v#{release_version}")
Bumpsnag.commit_changes(message)
Bumpsnag.push_changes(release_branch)

pp 'Update complete'
Expand Down

0 comments on commit 6d6cdb1

Please sign in to comment.