From 4de720c8b38a8480800a567d488431c4d0286fa1 Mon Sep 17 00:00:00 2001 From: Symbioquine Date: Sun, 18 Feb 2024 09:45:01 -0800 Subject: [PATCH] Declare compatibility with farmOS 3.x --- .github/workflows/run-tests.yml | 2 ++ CHANGELOG.md | 9 ++++++++- README.md | 5 +++-- docker/docker-compose.prod-demo.yml | 5 ++--- docker/docker-compose.yml | 6 +++--- .../farmos_land_drawing_tool.info.yml | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 8 files changed, 22 insertions(+), 13 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index e066171..180f584 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -16,6 +16,8 @@ jobs: run: until [ -f ./www/www-container-fs-ready ]; do sleep 0.1; done && while { ! exec 3<>/dev/tcp/localhost/5432; } > /dev/null 2>&1; do sleep 0.1; done - name: Do a site-install run: docker-compose exec -u www-data -T www bash -c 'drush site-install farm --locale=en --db-url=pgsql://farm:farm@db/farm --site-name=Test0 --account-name=root --account-pass=test' + - name: Enable oauth prereqs via drush + run: docker-compose exec -u www-data -T www drush en simple_oauth_password_grant farm_api_default_consumer - name: Add farmOS_land_drawing_tool via composer run: docker-compose exec -u www-data -T www composer require drupal/farmos_land_drawing_tool - name: Use drush to enable farmOS_land_drawing_tool diff --git a/CHANGELOG.md b/CHANGELOG.md index 604d407..0fd71ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.1.0] - 2024-02-18 + +### Changed + +- Declare compatibility with farmOS 3.x + ## [1.0.5] - 2023-02-28 ### Fixed @@ -44,7 +50,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Initial release -[unreleased]: https://github.com/symbioquine/farmOS_land_drawing_tool/compare/unbuilt-v1.0.5...HEAD +[unreleased]: https://github.com/symbioquine/farmOS_land_drawing_tool/compare/unbuilt-v1.1.0...HEAD +[1.1.0]: https://github.com/symbioquine/farmOS_land_drawing_tool/compare/unbuilt-v1.0.5...unbuilt-v1.1.0 [1.0.5]: https://github.com/symbioquine/farmOS_land_drawing_tool/compare/unbuilt-v1.0.4...unbuilt-v1.0.5 [1.0.4]: https://github.com/symbioquine/farmOS_land_drawing_tool/compare/unbuilt-v1.0.3...unbuilt-v1.0.4 [1.0.3]: https://github.com/symbioquine/farmOS_land_drawing_tool/compare/unbuilt-v1.0.2...unbuilt-v1.0.3 diff --git a/README.md b/README.md index 4c06651..d477406 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # farmOS_land_drawing_tool -A land drawing tool contrib module for [farmOS](https://farmos.org/) 2.x. +A land drawing tool contrib module for [farmOS](https://farmos.org/) 3.x. ![image](https://user-images.githubusercontent.com/30754460/124950481-4c81e800-dfc7-11eb-8c35-4545883d72ff.png) @@ -8,7 +8,7 @@ A land drawing tool contrib module for [farmOS](https://farmos.org/) 2.x. ## Installation -Use Composer and Drush to install farmOS_land_drawing_tool in farmOS 2.x; +Use Composer and Drush to install farmOS_land_drawing_tool in farmOS 3.x; ```sh composer require drupal/farmos_land_drawing_tool @@ -46,6 +46,7 @@ From the [development branch][development branch] of this repository: git add [...] # Update NPM package version and commit npm --no-git-tag-version version --force patch +git add -u git commit # Tag the release with the unbuilt prefix git tag unbuilt-v9000.0.1 diff --git a/docker/docker-compose.prod-demo.yml b/docker/docker-compose.prod-demo.yml index 10750cd..1f6f09a 100644 --- a/docker/docker-compose.prod-demo.yml +++ b/docker/docker-compose.prod-demo.yml @@ -1,7 +1,7 @@ version: '3' services: db: - image: postgres:12 + image: postgres:13 volumes: - './db:/var/lib/postgresql/data' ports: @@ -14,8 +14,7 @@ services: www: depends_on: - db - # TODO: change the image to remove the '-dev' part once there's a prod release of 2.x - image: farmos/farmos:2.x-dev + image: farmos/farmos:3.1.1 volumes: - './www:/opt/drupal' ports: diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 0b6cd41..b58d2f7 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: db: - image: postgres:12 + image: postgres:13 volumes: - './db:/var/lib/postgresql/data' ports: @@ -14,7 +14,7 @@ services: www: depends_on: - db - image: farmos/farmos:2.x-dev + image: farmos/farmos:3.1.1 entrypoint: /bin/bash command: - -c @@ -36,7 +36,7 @@ services: wait_db_ready - su www-data -s /bin/bash <<'EOF' + /bin/bash <<'EOF' set -e composer config repositories.farmos_dev_modules '{"type": "path", "url": "/farmos_dev_modules/farmos_land_drawing_tool"}' diff --git a/farmos_land_drawing_tool/farmos_land_drawing_tool.info.yml b/farmos_land_drawing_tool/farmos_land_drawing_tool.info.yml index 1fee1b5..db771d3 100644 --- a/farmos_land_drawing_tool/farmos_land_drawing_tool.info.yml +++ b/farmos_land_drawing_tool/farmos_land_drawing_tool.info.yml @@ -2,7 +2,7 @@ name: farmOS Land Drawing Tool description: Provides a land drawing tool for farmOS type: module package: farmOS Contrib -core_version_requirement: ^9 +core_version_requirement: ^9 || ^10 dependencies: - farm_land - farm_map diff --git a/package-lock.json b/package-lock.json index 5ae9d60..f2955d7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "farmOS_land_drawing_tool", - "version": "1.0.5", + "version": "1.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "farmOS_land_drawing_tool", - "version": "1.0.5", + "version": "1.1.0", "license": "GPL-3.0-or-later", "dependencies": { "@farmos.org/farmos-map": "^2.0.4", diff --git a/package.json b/package.json index f8952b1..540682d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "farmOS_land_drawing_tool", - "version": "1.0.5", + "version": "1.1.0", "description": "A land drawing tool contrib module for farmOS.", "license": "GPL-3.0-or-later", "repository": {