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

Change FPS references to RWS references #87

Merged
merged 2 commits into from
Oct 3, 2023
Merged

Change FPS references to RWS references #87

merged 2 commits into from
Oct 3, 2023

Conversation

sjledoux
Copy link
Collaborator

@sjledoux sjledoux commented Sep 28, 2023

Now that the "First-Party Sets" project has been officially renamed to "Related Website Sets", references and filenames should be changed accordingly to refer to Related Websites rather than First-Parties.

Note: This PR should not be merged until the rest of the pipeline is prepared to handle the name change as well.

Additional note: This PR will fail the normal runs due to the change in various file names

Getting-Started.md Outdated Show resolved Hide resolved
RWS-Submission_Guidelines.md Outdated Show resolved Hide resolved
tests/rws_tests.py Outdated Show resolved Hide resolved
@@ -32,7 +32,7 @@ jobs:
run: pip install publicsuffix2
- name: Content check
id: check
run: python3 main/check_sites.py -i pull-request/first_party_sets.JSON --data_directory=main --with_diff > results.txt
run: python3 main/check_sites.py -i pull-request/related_website_sets.JSON --data_directory=main --with_diff > results.txt
Copy link
Collaborator

Choose a reason for hiding this comment

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

This means that the workflow will be broken for this PR only, but should work afterward, right?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yeah, the current check is failing because it uses the main's version of the submission checks and is failing to find first-party-sets.json in this branch. Once this is merged, it shouldn't be a problem though.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Right. Since there's another open PR, should we update the workflow so that it can handle either filename? Or are we planning on just asking the PR author to rebase and try again?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It might be best to ask for the rebase. If we update the workflow and accept PRs with first-party-sets.JSON, we'd end up with 2 submission lists by accepting the PR and would have to resolve that ourselves, right?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Actually, I think the checkout action will grab the latest version of main, instead of the parent commit of the PR branch. So no one would have to rebase, if we submit this as-is.

Copy link
Collaborator

@cfredric cfredric left a comment

Choose a reason for hiding this comment

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

Approving; go ahead and merge if you're ready.

@sjledoux sjledoux merged commit 6582c31 into main Oct 3, 2023
3 of 4 checks passed
@sjledoux sjledoux deleted the fps-to-rws branch October 3, 2023 15:50
cfredric pushed a commit that referenced this pull request Oct 3, 2023
Readme.md was missed by [the renaming PR](#87), so its file references are now out of date. This PR updates those references to account for the FPS to RWS change.
@Leonelhdzm99

This comment was marked as spam.

@Leonelhdzm99

This comment was marked as spam.

@Leonelhdzm99 Leonelhdzm99 mentioned this pull request Dec 24, 2023
Closed
Copy link

@Avalir1996 Avalir1996 left a comment

Choose a reason for hiding this comment

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

Pleas i Help you

@McCollum2024
Copy link

Now that the "First-Party Sets" project has been officially renamed to "Related Website Sets", references and filenames should be changed accordingly to refer to Related Websites rather than First-Parties.

Note: This PR should not be merged until the rest of the pipeline is prepared to handle the name change as well.

Additional note: This PR will fail the normal runs due to the change in various file names
Vera O McCollum 08/30/2024

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

Successfully merging this pull request may close these issues.

5 participants