Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Elixir to v1.12.3 #127

Merged
merged 30 commits into from
Sep 25, 2021
Merged

Conversation

nelsonic
Copy link
Member

@nelsonic nelsonic commented Sep 21, 2021

This PR:

@iteles please review/merge when you can.
My next step is to update the version of Phoenix and deploy to Fly.io dwyl/learn-devops#72
But I don't want to make this PR too big. 💭

@nelsonic
Copy link
Member Author

Merge conflicts I need to resolve:

n@MBP hits % git pull origin master --rebase
remote: Enumerating objects: 43, done.
remote: Counting objects: 100% (43/43), done.
remote: Compressing objects: 100% (40/40), done.
remote: Total 40 (delta 24), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (40/40), 14.51 KiB | 200.00 KiB/s, done.
From github.com:dwyl/hits
 * branch            master     -> FETCH_HEAD
   971f459..3b51eb2  master     -> origin/master
Auto-merging test/support/conn_case.ex
CONFLICT (content): Merge conflict in test/support/conn_case.ex
Auto-merging test/support/channel_case.ex
CONFLICT (content): Merge conflict in test/support/channel_case.ex
Auto-merging mix.exs
CONFLICT (content): Merge conflict in mix.exs
Auto-merging lib/hits/application.ex
Auto-merging config/config.exs
CONFLICT (content): Merge conflict in config/config.exs
error: could not apply b33d9f7... upgrade to Phoenix 1.5.3 fixes issue #103
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply b33d9f7... upgrade to Phoenix 1.5.3 fixes issue #103

@nelsonic
Copy link
Member Author

Spot the conflict ... 🤷‍♂️
image

@nelsonic
Copy link
Member Author

git rebase --continue
[detached HEAD b1ac67a] upgrade to Phoenix 1.5.3 fixes issue #103
 Author: nelsonic <[email protected]>
 4 files changed, 5 insertions(+), 3 deletions(-)
Auto-merging mix.lock
CONFLICT (content): Merge conflict in mix.lock
Auto-merging mix.exs
CONFLICT (content): Merge conflict in mix.exs
error: could not apply 681c393... upgrade all dependencies to latest versions #103
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 681c393... upgrade all dependencies to latest versions #103

@nelsonic
Copy link
Member Author

Migrate to .com https://app.travis-ci.com/github/dwyl/hits
image

@codecov
Copy link

codecov bot commented Sep 21, 2021

Codecov Report

Merging #127 (a741c5c) into master (971f459) will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##            master      #127   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files           11        11           
  Lines           62        63    +1     
=========================================
+ Hits            62        63    +1     
Impacted Files Coverage Δ
lib/hits/application.ex 100.00% <ø> (ø)
lib/hits_web/channels/hit_channel.ex 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 971f459...a741c5c. Read the comment docs.

@nelsonic nelsonic changed the title [WIP] Several Maintenance/Enhancements Update Elixir to v1.12.3 Sep 21, 2021
@nelsonic nelsonic mentioned this pull request Sep 21, 2021
1 task
@nelsonic
Copy link
Member Author

@iteles if you have a couple of minutes, please review/merge this PR. Thanks. 👍

@iteles
Copy link
Member

iteles commented Sep 25, 2021

Sorry, I've been reviewing this slowly!

@iteles iteles merged commit 893aaab into master Sep 25, 2021
@iteles iteles deleted the update-elixir-version-v1.12.3-issue-#125 branch September 25, 2021 10:41
@nelsonic
Copy link
Member Author

@iteles thanks. ☀️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants