From 1bfafc1b6ebd9008285b9d0f89bce8ddfa24bcc9 Mon Sep 17 00:00:00 2001 From: Merlijn Sebrechts Date: Wed, 16 Nov 2022 17:34:30 +0100 Subject: [PATCH 1/3] remove old build config --- .build-trigger.txt | 18 ------------------ .travis.yml | 34 ---------------------------------- 2 files changed, 52 deletions(-) delete mode 100644 .build-trigger.txt delete mode 100644 .travis.yml diff --git a/.build-trigger.txt b/.build-trigger.txt deleted file mode 100644 index a746ac4..0000000 --- a/.build-trigger.txt +++ /dev/null @@ -1,18 +0,0 @@ -2018-07-16-09:48:50 -2018-08-31-08:12:32 -2018-09-17-08:13:59 -2018-11-01-09:51:51 -2019-05-23-08:14:29 -2019-05-31-08:19:05 -2019-06-12-17:44:12 -2019-06-20-08:37:04 -2019-09-13-08:49:17 -2019-10-01-07:52:49 -2019-11-16-11:45:05 -2019-11-28-09:15:10 -2019-12-03-09:16:34 -2020-10-21-08:37:05 -2020-11-13-00:10:54 -2020-12-04-09:41:34 -2021-02-09-10:05:03 -2021-04-16-11:05:25 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 9126a3d..0000000 --- a/.travis.yml +++ /dev/null @@ -1,34 +0,0 @@ -language: bash -dist: xenial - -env: - global: - - LC_ALL: C.UTF-8 - - LANG: C.UTF-8 - - SNAPCRAFT_ENABLE_SILENT_REPORT: y - - SNAPCRAFT_ENABLE_DEVELOPER_DEBUG: y - -addons: - snaps: - - name: snapcraft - channel: stable - classic: true - - name: http - - name: transfer - - name: lxd - channel: stable - -script: - - sudo apt update - - sudo /snap/bin/lxd.migrate -yes - - sudo /snap/bin/lxd waitready - - sudo /snap/bin/lxd init --auto - - mkdir -p "$TRAVIS_BUILD_DIR/snaps-cache" - - sudo snapcraft --use-lxd -after_success: - - cp *.snap "$(echo "$TRAVIS_REPO_SLUG" | sed -e 's|.*/\(.*\)|\1|')-pr$TRAVIS_PULL_REQUEST.snap" - - timeout 180 /snap/bin/transfer "$(echo "$TRAVIS_REPO_SLUG" | sed -e 's|.*/\(.*\)|\1|')-pr$TRAVIS_PULL_REQUEST.snap" -after_failure: - - sudo journalctl -u snapd - - http https://api.snapcraft.io/v2/snaps/info/core architecture==amd64 Snap-Device-Series:16 - From a95e3bf2501e017cda3b46ae4472d76e7cc145ea Mon Sep 17 00:00:00 2001 From: Merlijn Sebrechts Date: Wed, 16 Nov 2022 17:51:37 +0100 Subject: [PATCH 2/3] update metadata and readme --- README.md | 66 +++++++-------------------------------------- snap/snapcraft.yaml | 24 +++++++++++------ 2 files changed, 25 insertions(+), 65 deletions(-) diff --git a/README.md b/README.md index 0eb3b57..cdcddba 100644 --- a/README.md +++ b/README.md @@ -4,71 +4,23 @@ Minetest -

This is the snap for Minetest, "SA free, open source voxel game engine and game. Fully extendable. You are in control.". It works on Ubuntu, Fedora, Debian, and other major Linux -distributions.

+

This is the snap for Minetest. This snap is a community-maintained package to easily install Minetest on Ubuntu, Fedora, Debian and other major Linux distributions. It is available in the Snap Store, Ubuntu Software, and a number of other software stores.

-[![Snap Status](https://build.snapcraft.io/badge/snapcrafters/minetest.svg)](https://build.snapcraft.io/user/snapcrafters/minetest) +[![minetest](https://snapcraft.io/minetest/badge.svg)](https://snapcraft.io/minetest) ## Install - sudo snap install minetest --candidate +```shell +sudo snap install minetest +``` ([Don't have snapd installed?](https://snapcraft.io/docs/core/install)) ![minetest](https://dashboard.snapcraft.io/site_media/appmedia/2018/01/Screenshot_from_2018-01-14_18-38-01.png "minetest") -

Published for with :gift_heart: by Snapcrafters

+

Published for with :gift_heart: by Snapcrafters

-## Remaining tasks +## License -Snapcrafters ([join us](https://forum.snapcraft.io/t/join-snapcrafters/1325)) -are working to land snap install documentation and -the [snapcraft.yaml](https://github.com/snapcrafters/fork-and-rename-me/blob/master/snap/snapcraft.yaml) -upstream so [Minetest] can authoritatively publish future releases. - - - [x] Fork the [Snapcrafters template](https://github.com/snapcrafters/fork-and-rename-me) repository to your own GitHub account. - - If you have already forked the Snapcrafter template to your account and want to create another snap, you'll need to use GitHub's [Import repository](https://github.com/new/import) feature because you can only fork a repository once. - - [x] Rename the forked Snapcrafters template repository - - [x] Update logos and references to `[Project]` and `[my-snap-name]` - - [x] Create a snap that runs in `devmode` - - [x] Register the snap in the store, **using the preferred upstream name** - - [x] Add a screenshot to this `README.md` - - [x] Publish the `devmode` snap in the Snap store edge channel - - [x] Add install instructions to this `README.md` - - [x] Update snap store metadata, icons and screenshots - - [x] Convert the snap to `strict` confinement, or `classic` confinement if it qualifies - - [x] Publish the confined snap in the Snap store beta channel - - [x] Update the install instructions in this `README.md` - - [x] Post a call for testing on the [Snapcraft Forum](https://forum.snapcraft.io) - [link](https://forum.snapcraft.io/t/call-for-testing-minetest-snap/3526) - - [x] Ask a [Snapcrafters admin](https://github.com/orgs/snapcrafters/people?query=%20role%3Aowner) to fork your repo into github.com/snapcrafters, transfer the snap name from you to snapcrafters, and configure the repo for automatic publishing into edge on commit - - [x] Add the provided Snapcraft build badge to this `README.md` - - [ ] Publish the snap in the Snap store stable channel - - [ ] Update the install instructions in this `README.md` - - [ ] Post an announcement in the [Snapcraft Forum](https://forum.snapcraft.io) - [link]() - - [ ] Submit a pull request or patch upstream that adds snap install documentation - [link]() - - [ ] Submit a pull request or patch upstream that adds the `snapcraft.yaml` and any required assets/launchers - [link]() - - [ ] Add upstream contact information to the `README.md` - - If upstream accept the PR: - - [ ] Request upstream create a Snap store account - - [ ] Contact the Snap Advocacy team to request the snap be transferred to upstream - - [ ] Ask the Snap Advocacy team to celebrate the snap - [link]() - -If you have any questions, [post in the Snapcraft forum](https://forum.snapcraft.io). - - - - - -[Minetest]: https://www.minetest.net +* The license of the build files in this repository is MIT. +* The license of Minetest itself is LGPL-2.1+ diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 79e3a79..8eb0c8a 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,17 +1,24 @@ name: minetest -summary: "Minetest" +title: Minetest +summary: Open source voxel game engine description: | - Minetest is a minecraft-inspired game written from scratch and licensed - under the LGPL (version 2.1 or later). It supports both survival and - creative modes along with multiplayer support, dynamic lighting, and an - "infinite" map generator. -grade: stable -confinement: strict + Minetest is a minecraft-inspired game written from scratch and licensed under the LGPL (version 2.1 or later). It supports both survival and creative modes along with multiplayer support, dynamic lighting, and an "infinite" map generator. + + **Authors** + + This snap package is maintained by the Snapcrafters community. It is not necessarily endorsed or officially supported by the developers of the application itself. +license: LGPL-2.1-or-later +website: https://www.minetest.net/ +contact: https://github.com/snapcrafters/minetest/issues +issues: https://github.com/snapcrafters/minetest/issues +source-code: https://github.com/snapcrafters/minetest icon: snap/gui/minetest.svg adopt-info: minetest + base: core18 compression: lzo - +grade: stable +confinement: strict architectures: - build-on: armhf - build-on: i386 @@ -61,6 +68,7 @@ parts: snapcraftctl build organize: '*': 'share/minetest/games/minetest_game/' + minetest: plugin: cmake source: https://github.com/minetest/minetest.git From 4316e69f81769549f965a6fda643fd444e737533 Mon Sep 17 00:00:00 2001 From: Dani Llewellyn Date: Wed, 16 Nov 2022 17:22:48 +0000 Subject: [PATCH 3/3] Fix irrlicht version by using git tags --- snap/snapcraft.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 8eb0c8a..f26860b 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -38,6 +38,7 @@ parts: irrlicht: source: https://github.com/minetest/irrlicht.git + source-tag: 1.9.0mt8 # must be updated to match whatever a specific minetest version requires plugin: cmake configflags: - -DBUILD_SHARED_LIBS=OFF