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

406CBC & 4077FC Photo Update, Add C2B55D #170

Merged
merged 4 commits into from
Mar 18, 2023
Merged

Conversation

Phaeton
Copy link
Collaborator

@Phaeton Phaeton commented Mar 17, 2023

Describe your changes

406CBC & 4077FC Photo Update

Checklist before requesting a review

  • I have performed a self-review of my code.
  • While waiting for someone to review your request, please help review another open pull request to support the maintainers.

@github-actions github-actions bot added images Plane images planes Plane info labels Mar 17, 2023
@github-actions
Copy link

github-actions bot commented Mar 17, 2023

Please only suggest/make any changes to the following files:

All other files are generated from this file using the .github/workflows/create_db_derivatives.yaml GitHub action, and if you do not make your changes there, they will be overwritten and lost.

@github-actions github-actions bot added the invalid This doesn't seem right label Mar 17, 2023
@Phaeton Phaeton changed the title 406CBC & 4077FC Photo Update 406CBC & 4077FC Photo Update, Add C2B55D Mar 17, 2023
@rickstaa
Copy link
Collaborator

@Phaeton I checked your pull request, and it is correct. The check failed because you are working on your main branch, and the commit made by the https://github.com/sdr-enthusiasts/plane-alert-db/blob/main/.github/workflows/create_db_derivatives.yaml action does not re-trigger the https://github.com/sdr-enthusiasts/plane-alert-db/blob/main/.github/workflows/check_derivatives_change.yml action (see https://github.com/orgs/community/discussions/25702#discussioncomment-3248819). This can be fixed, but it will require a lot of code. I, therefore, think it is better to:

  1. Fork the repo and create your branch from main.
  2. Create a new feature branch (e.g. patch) to implement your changes.
  3. Make your changes.
  4. Issue that pulls requests from your feature branch!
  5. Merge your feature branch into your own main branch, so you don't have to wait for the PR to be merged.

This is how GitHub recommends you create PRs to repositories. Does that work for you 🤔? I also updated the CONTRIBUTING.md file to represent this change.

@rickstaa rickstaa merged commit 530ea4c into sdr-enthusiasts:main Mar 18, 2023
@rickstaa
Copy link
Collaborator

@Phaeton I checked your pull request, and it is correct. The check failed because you are working on your main branch, and the commit made by the https://github.com/sdr-enthusiasts/plane-alert-db/blob/main/.github/workflows/create_db_derivatives.yaml action does not re-trigger the https://github.com/sdr-enthusiasts/plane-alert-db/blob/main/.github/workflows/check_derivatives_change.yml action (see https://github.com/orgs/community/discussions/25702#discussioncomment-3248819). This can be fixed, but it will require a lot of code. I, therefore, think it is better to:

  1. Fork the repo and create your branch from main.
  2. Create a new feature branch (e.g. patch) to implement your changes.
  3. Make your changes.
  4. Issue that pulls requests from your feature branch!
  5. Merge your feature branch into your own main branch, so you don't have to wait for the PR to be merged.

This is how GitHub recommends you create PRs to repositories. Does that work for you 🤔? I also updated the CONTRIBUTING.md file to represent this change.

If you really want to work from the main branch, this is also possible, but then you have to run the create_db_derivatives.py file on your local machine to get the correct derivative files included in the PR.

@rickstaa
Copy link
Collaborator

@Phaeton I did some more tests, and it seems to work when the PR is created after the action has already committed the files (see https://github.com/sdr-enthusiasts/plane-alert-db/pulls). It fails when you create the pull request before the https://github.com/sdr-enthusiasts/plane-alert-db/blob/main/.github/workflows/create_db_derivatives.yaml has added the databases. I will update the CONTRIBUTING.md to reflect this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
images Plane images invalid This doesn't seem right planes Plane info
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants