Failed to auto-update `cargo-generate`

[github-actions[bot]]

There were merge conflicts while trying to update cargo-generate from main. You can do it manually by running:

# Update your local copy of the `main` branch.
git switch main
git pull
# Checkout the `cargo-generate` branch.
git checkout cargo-generate
# Merge changes from `main` to `cargo-generate`. You will have to fix merge conflicts.
git merge main

git status

``` On branch cargo-generate Your branch is up to date with 'origin/cargo-generate'. You have unmerged paths. (fix conflicts and run "git commit") (use "git merge --abort" to abort the merge) Changes to be committed: modified: .editorconfig new file: .github/workflows/cargo-generate.yaml modified: README.md renamed: assets/audio/bgm/Fluffing A Duck.ogg -> assets/audio/music/Fluffing A Duck.ogg renamed: assets/audio/bgm/Monkeys Spinning Monkeys.ogg -> assets/audio/music/Monkeys Spinning Monkeys.ogg renamed: assets/audio/sfx/button_hover.ogg -> assets/audio/sound_effects/button_hover.ogg renamed: assets/audio/sfx/button_press.ogg -> assets/audio/sound_effects/button_press.ogg renamed: assets/audio/sfx/step1.ogg -> assets/audio/sound_effects/step1.ogg renamed: assets/audio/sfx/step2.ogg -> assets/audio/sound_effects/step2.ogg renamed: assets/audio/sfx/step3.ogg -> assets/audio/sound_effects/step3.ogg renamed: assets/audio/sfx/step4.ogg -> assets/audio/sound_effects/step4.ogg modified: docs/design.md modified: docs/workflows.md new file: src/asset_tracking.rs deleted: src/assets.rs new file: src/audio.rs deleted: src/audio/bgm.rs deleted: src/audio/mod.rs deleted: src/audio/sfx.rs modified: src/demo/animation.rs modified: src/demo/level.rs modified: src/demo/mod.rs modified: src/demo/player.rs modified: src/lib.rs modified: src/screens/credits.rs new file: src/screens/gameplay.rs modified: src/screens/loading.rs modified: src/screens/mod.rs deleted: src/screens/playing.rs modified: src/screens/splash.rs modified: src/screens/title.rs modified: src/theme/interaction.rs modified: src/theme/mod.rs modified: src/theme/widgets.rs Unmerged paths: (use "git add ..." to mark resolution) both modified: .github/workflows/release.yaml.liquid ```

git diff --diff-filter=U

```diff diff --cc .github/workflows/release.yaml.liquid index 6a76770,d0c037d..0000000 --- a/.github/workflows/release.yaml.liquid +++ b/.github/workflows/release.yaml.liquid @@@ -14,34 -14,54 +14,74 @@@ on required: true type: string - # Configure constants for this workflow. + # Configure the release workflow by editing these values. env: # The base filename of the binary produced by `cargo build`. ++<<<<<<< HEAD:.github/workflows/release.yaml.liquid + BINARY: {{project-name}} + # The name to use for the packaged application produced by this workflow. + PACKAGE_NAME: {{project-name}} + # The itch.io page to upload to, in the format: `user-name/project-name`. + # Comment this out to disable. + {%- if itch_username != "" %} + {%- if itch_project != "" %} + ITCH_TARGET: {{itch_username}}/{{itch_project}} + {%- else %} + ITCH_TARGET: {{itch_username}}/{{project-name}} + {%- endif %} + {%- else %} + # ITCH_TARGET: your-itch-username/{{project-name}} + {%- endif %} + # The organization or author that owns the rights to the game. + OWNER: {{itch_username}} ++======= + cargo_build_binary_name: bevy_quickstart + ++>>>>>>> main:.github/workflows/release.yaml # The path to the assets directory. - ASSETS_DIR: assets - # Whether packages produced by this workflow should be uploaded to the Github release. - UPLOAD_PACKAGES_TO_GITHUB_RELEASE: true + assets_path: assets + + # Whether to upload the packages produced by this workflow to a GitHub release. + upload_to_github: true + + # The itch.io project to upload to in the format `user-name/project-name`. + # There will be no upload to itch.io if this is commented out. + upload_to_itch: the-bevy-flock/bevy-quickstart + + ############ + # ADVANCED # + ############ + + # The ID of the app produced by this workflow. + # Applies to macOS releases. + # Must contain only A-Z, a-z, 0-9, hyphen, and period: https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleidentifier + app_id: the-bevy-flock.bevy-quickstart + + # The base filename of the binary in the package produced by this workflow. + # Applies to Windows, macOS, and Linux releases. + # Defaults to `cargo_build_binary_name` if commented out. + #app_binary_name: bevy_quickstart + + # The name of the `.zip` or `.dmg` file produced by this workflow. + # Defaults to `app_binary_name` if commented out. + app_package_name: bevy-quickstart + + # The display name of the app produced by this workflow. + # Applies to macOS releases. + # Defaults to `app_package_name` if commented out. + app_display_name: Bevy Quickstart + + # The short display name of the app produced by this workflow. + # Applies to macOS releases. + # Must be 15 or fewer characters: https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundlename + # Defaults to `app_display_name` if commented out. + #app_short_name: Bevy Quickstart + # Before enabling LFS, please take a look at GitHub's documentation for costs and quota limits: # https://docs.github.com/en/repositories/working-with-files/managing-large-files/about-storage-and-bandwidth-usage - USE_GIT_LFS: false + git_lfs: false +{%- raw %} jobs: # Determine the version number for this workflow. get-version: @@@ -270,8 -298,7 +318,8 @@@ for channel in $(ls tmp); do ./butler push \ --fix-permissions \ - --userversion='${{ env.VERSION }}' \ + --userversion='${{ needs.get-version.outputs.version }}' \ tmp/"${channel}"/* \ - '${{ env.ITCH_TARGET }}':"${channel#package-}" + '${{ env.upload_to_itch }}':"${channel#package-}" done +{% endraw -%} ```

This is an automated message created by cargo-generate.yaml.