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

snap: add track 'latest' if no track is specified #6835

Merged

Conversation

russoz
Copy link
Collaborator

@russoz russoz commented Jul 3, 2023

SUMMARY

When a channel is specified but not using a track, the default track latest is added. the snap list command does that, so this is necessary to match the requested channel with the already installed ones.

See https://snapcraft.io/docs/channels for more details.

A test case has been added to the unit tests to assert that scenario works.

Fixes #6821

ISSUE TYPE
  • Bugfix Pull Request
  • Test Pull Request
COMPONENT NAME

snap

@ansibullbot
Copy link
Collaborator

@ansibullbot ansibullbot added bug This issue/PR relates to a bug integration tests/integration module module plugins plugin (any type) tests tests unit tests/unit labels Jul 3, 2023
@felixfontein felixfontein added check-before-release PR will be looked at again shortly before release and merged if possible. backport-6 labels Jul 3, 2023
@felixfontein
Copy link
Collaborator

This PR needs a changelog fragment :)

@russoz
Copy link
Collaborator Author

russoz commented Jul 3, 2023

Darn, you're always faster than me on these things :-P

@felixfontein
Copy link
Collaborator

Looks good to me. If nobody objects by the end of this week, I'll merge.

@felixfontein felixfontein removed the check-before-release PR will be looked at again shortly before release and merged if possible. label Jul 8, 2023
@felixfontein felixfontein merged commit dc0d004 into ansible-collections:main Jul 8, 2023
@patchback
Copy link

patchback bot commented Jul 8, 2023

Backport to stable-6: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply dc0d004 on top of patchback/backports/stable-6/dc0d00452fa6070f01c618ad95f3edc44209af4b/pr-6835

Backporting merged PR #6835 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible-collections/community.general.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-6/dc0d00452fa6070f01c618ad95f3edc44209af4b/pr-6835 upstream/stable-6
  4. Now, cherry-pick PR snap: add track 'latest' if no track is specified #6835 contents into that branch:
    $ git cherry-pick -x dc0d00452fa6070f01c618ad95f3edc44209af4b
    If it'll yell at you with something like fatal: Commit dc0d00452fa6070f01c618ad95f3edc44209af4b is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x dc0d00452fa6070f01c618ad95f3edc44209af4b
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR snap: add track 'latest' if no track is specified #6835 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-6/dc0d00452fa6070f01c618ad95f3edc44209af4b/pr-6835
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@felixfontein
Copy link
Collaborator

@russoz thanks!

@patchback
Copy link

patchback bot commented Jul 8, 2023

Backport to stable-7: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-7/dc0d00452fa6070f01c618ad95f3edc44209af4b/pr-6835

Backported as #6888

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Jul 8, 2023
* snap: add track 'latest' if no track is specified

See https://snapcraft.io/docs/channels for more details.

* snap: assume track latest if channel does not specify it

(cherry picked from commit dc0d004)
@russoz russoz deleted the 6821-snap-failure branch July 8, 2023 09:00
felixfontein pushed a commit that referenced this pull request Jul 8, 2023
… track is specified (#6888)

snap: add track 'latest' if no track is specified (#6835)

* snap: add track 'latest' if no track is specified

See https://snapcraft.io/docs/channels for more details.

* snap: assume track latest if channel does not specify it

(cherry picked from commit dc0d004)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
valeriopoggi pushed a commit to valeriopoggi/community.general that referenced this pull request Jul 17, 2023
…s#6835)

* snap: add track 'latest' if no track is specified

See https://snapcraft.io/docs/channels for more details.

* snap: assume track latest if channel does not specify it
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This issue/PR relates to a bug integration tests/integration module module plugins plugin (any type) tests tests unit tests/unit
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Failed to install snap package: snap \"shellcheck\" has no updates available
3 participants