Skip to content
This repository has been archived by the owner on Sep 30, 2024. It is now read-only.

syntax-highlighter: reference sourcegraph/Packages #34901

Merged
merged 1 commit into from
May 4, 2022

Conversation

keegancsmith
Copy link
Member

I read these outdated references to slimsag/Packages and sent a PR to the wrong repo.

Test Plan: n/a

I read these outdated references to slimsag/Packages and sent a PR to
the wrong repo.

Test Plan: n/a
@keegancsmith keegancsmith requested review from emidoots and a team May 4, 2022 14:28
@cla-bot cla-bot bot added the cla-signed label May 4, 2022
Copy link
Contributor

@Strum355 Strum355 left a comment

Choose a reason for hiding this comment

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

Oh I also thought we were still using the fork :clueless: good to know, thanks

@keegancsmith keegancsmith enabled auto-merge (squash) May 4, 2022 14:36
@keegancsmith keegancsmith merged commit e276e95 into main May 4, 2022
@keegancsmith keegancsmith deleted the k/20220504-syntax-docs branch May 4, 2022 14:37
@varungandhi-src
Copy link
Contributor

varungandhi-src commented May 4, 2022

Ugh, sorry about the confusion here. 😖 I made an incorrect comment in sourcegraph/syntect. Looks like we're still using the slimsag fork, as reflected in the Cargo.toml file here.

https://github.com/sourcegraph/sourcegraph/blob/03526e551a5a52f4ce562529afa7e64b43a3dde7/docker-images/syntax-highlighter/Cargo.toml#L12

slimsag/syntect in turn is using slimsag/Packages: https://github.com/slimsag/syntect/blob/bbb71bc0cb5af9488f31a10de5ef409f5b347617/.gitmodules#L4

The main pending items here were:

  1. (In Sourcegraph/Packages) Update ST3 branch with Sourcegraph-specific changes Packages#5
  2. Bump Packages dependency to point to Sourcegraph fork syntect#9
  3. https://github.com/sourcegraph/sourcegraph/issues/34945

I'd started some work on this earlier, but was blocked because of some test failures in Sourcegraph/Packages.

I was planning on making some progress here this iteration; I'll try to get this mess sorted out over the next 1-2 days.

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

Successfully merging this pull request may close these issues.

5 participants