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

Sync vendored scripts #40

Merged
merged 6 commits into from
Oct 10, 2023
Merged

Sync vendored scripts #40

merged 6 commits into from
Oct 10, 2023

Conversation

victorlin
Copy link
Member

@victorlin victorlin commented Sep 14, 2023

Description of proposed changes

There are new scripts in nextstrain/ingest. I did a quick check and none of them are used in this repo. Doesn't hurt to pull them in anyways.

Related issue(s)

Checklist

  • Checks pass

The last reference was removed in 8b11a7a.
The last reference was removed in 53f0296.
Something funny happened where 7e0ea00
was rebased as-is (instead of re-applying), so the parent commit in git
subrepo's internal file was not referencing something on the default
branch. This caused `git subrepo pull` to not work.

Manually editing the internal file so that `git subrepo pull` can work
again.
subrepo:
  subdir:   "ingest/vendored"
  merged:   "c97df23"
upstream:
  origin:   "https://github.com/nextstrain/ingest"
  branch:   "main"
  commit:   "c97df23"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"
@victorlin victorlin self-assigned this Sep 14, 2023
subrepo:
  subdir:   "ingest/vendored"
  merged:   "c02fa81"
upstream:
  origin:   "https://github.com/nextstrain/ingest"
  branch:   "main"
  commit:   "c02fa81"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"
@joverlee521
Copy link
Contributor

Ah, just realized the last sync I did in d0e00ab pulls in transform-strain-name which does get used in this repo. I'll update to replace it here.

@joverlee521
Copy link
Contributor

joverlee521 commented Oct 3, 2023

Waiting on trial run of ingest

Edit: Trial run completed successfully and uploaded outputs to s3://nextstrain-data/files/workflows/rsv/trial/sync-vendored/. Compared trial output metadata TSV files with production metadata TSV files and found no difference.

@joverlee521
Copy link
Contributor

Merging since the trial run worked as expected.

@joverlee521 joverlee521 merged commit 7a69d83 into master Oct 10, 2023
6 checks passed
@joverlee521 joverlee521 deleted the victorlin/sync-vendored branch October 10, 2023 17:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

2 participants