Skip to content

Conversation

GirlBossRush
Copy link
Contributor

TBD

@GirlBossRush GirlBossRush added the enhancement Some improvement that isn't a feature label Sep 15, 2021
@GirlBossRush GirlBossRush added this to the 3.12.1 milestone Sep 15, 2021
@GirlBossRush GirlBossRush requested a review from a team as a code owner September 15, 2021 19:20
@github-actions
Copy link

github-actions bot commented Sep 15, 2021

✨ Coder.com for PR #4171 deployed! It will be updated on every commit.

Copy link
Contributor

@jsjoeio jsjoeio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this all looks good but probably want a second opinion from @kylecarbs (plus CI is failing)

@jsjoeio
Copy link
Contributor

jsjoeio commented Sep 17, 2021

error Your lockfile needs to be updated, but yarn was run with --frozen-lockfile.

Do we need to update the yarn.lock file?

@GirlBossRush
Copy link
Contributor Author

GirlBossRush commented Sep 18, 2021 via email

@codecov
Copy link

codecov bot commented Sep 20, 2021

Codecov Report

Merging #4171 (bdca804) into main (4f3c8a5) will increase coverage by 0.94%.
The diff coverage is 88.88%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4171      +/-   ##
==========================================
+ Coverage   64.22%   65.17%   +0.94%     
==========================================
  Files          36       37       +1     
  Lines        1873     1898      +25     
  Branches      379      382       +3     
==========================================
+ Hits         1203     1237      +34     
+ Misses        569      562       -7     
+ Partials      101       99       -2     
Impacted Files Coverage Δ
src/node/main.ts 42.55% <83.33%> (+2.78%) ⬆️
src/node/link.ts 91.66% <91.66%> (ø)
src/node/util.ts 81.72% <0.00%> (+0.18%) ⬆️
src/node/app.ts 100.00% <0.00%> (+26.19%) ⬆️

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 4f3c8a5...bdca804. Read the comment docs.

@jsjoeio
Copy link
Contributor

jsjoeio commented Sep 20, 2021

This PR likely needs to be rebased and updated with the latest vscode commit

I wasn't sure what you meant by "updated with the latest vscode commit":

Option 1

  1. go to https://github.com/cdr/vscode
  2. hit Fetch upstream
  3. grab the latest vscode commit
  4. use that in vendor/package.json

Option 2

  1. go to https://github.com/cdr/vscode
  2. grab the latest vscode commit: affcb6753278c014d1eea83664e6fbf5d702852a
  3. use that in vendor/package.json

Option 3.

  1. look at main branch in code-server
  2. use vscode commit in vendor/package.json

I rebased and went with Option 3: 9cb5fb3759f46b10bc66e676fa7f44c51e84824b

I hope that's right. I'll wait for you to check before we merge this.

@GirlBossRush
Copy link
Contributor Author

Tentatively resolved in #4010

@jsjoeio jsjoeio deleted the coder-link branch July 1, 2022 19:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Some improvement that isn't a feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants