Creationshop/cannaiq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix(ci): Use YAML map format for docker-buildx build_args' (#21) from fix/ci-build-args-format into master

Browse Source 
Reviewed-on: https://code.cannabrands.app/Creationshop/dispensary-scraper/pulls/21
This commit is contained in:
kelly
2025-12-10 23:54:33 +00:00
parent 4054778b6c 56a5f00015
commit ca952c4674
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.woodpecker/.ci.yml
View File

@@ -90,10 +90,10 @@ steps:
platforms: linux/amd64 platforms: linux/amd64
provenance: false provenance: false
build_args: build_args:
- APP_BUILD_VERSION=${CI_COMMIT_SHA:0:8} APP_BUILD_VERSION: ${CI_COMMIT_SHA:0:8}
- APP_GIT_SHA=${CI_COMMIT_SHA} APP_GIT_SHA: ${CI_COMMIT_SHA}
- APP_BUILD_TIME=${CI_PIPELINE_CREATED} APP_BUILD_TIME: ${CI_PIPELINE_CREATED}
- CONTAINER_IMAGE_TAG=${CI_COMMIT_SHA:0:8} CONTAINER_IMAGE_TAG: ${CI_COMMIT_SHA:0:8}
depends_on: [] depends_on: []
when: when:
branch: master branch: master

19
wordpress-plugin/cannaiq-menus.php
View File

@@ -46,14 +46,17 @@ class CannaIQ_Menus_Plugin {
// Initialize plugin // Initialize plugin
load_plugin_textdomain('cannaiq-menus', false, dirname(plugin_basename(__FILE__)) . '/languages'); load_plugin_textdomain('cannaiq-menus', false, dirname(plugin_basename(__FILE__)) . '/languages');
// Register shortcodes // Register shortcodes - primary CannaIQ shortcodes
add_shortcode('cannaiq_products', [$this, 'products_shortcode']); add_shortcode('cannaiq_products', [$this, 'products_shortcode']);
add_shortcode('cannaiq_product', [$this, 'single_product_shortcode']); add_shortcode('cannaiq_product', [$this, 'single_product_shortcode']);
// Legacy shortcode support (backward compatibility)
add_shortcode('crawlsy_products', [$this, 'products_shortcode']); // DEPRECATED: Legacy shortcode aliases for backward compatibility only
add_shortcode('crawlsy_product', [$this, 'single_product_shortcode']); // These allow sites that used the old plugin names to continue working
add_shortcode('dutchie_products', [$this, 'products_shortcode']); // New implementations should use [cannaiq_products] and [cannaiq_product]
add_shortcode('dutchie_product', [$this, 'single_product_shortcode']); add_shortcode('crawlsy_products', [$this, 'products_shortcode']); // deprecated
add_shortcode('crawlsy_product', [$this, 'single_product_shortcode']); // deprecated
add_shortcode('dutchie_products', [$this, 'products_shortcode']); // deprecated
add_shortcode('dutchie_product', [$this, 'single_product_shortcode']); // deprecated
} }
/** /**
@@ -114,7 +117,9 @@ class CannaIQ_Menus_Plugin {
public function register_settings() { public function register_settings() {
register_setting('cannaiq_menus_settings', 'cannaiq_api_token'); register_setting('cannaiq_menus_settings', 'cannaiq_api_token');
// Migrate old settings if they exist // MIGRATION: Auto-migrate API tokens from old plugin versions
// This runs once - if user had crawlsy or dutchie plugin, their token is preserved
// Can be removed in a future major version once all users have migrated
$old_crawlsy_token = get_option('crawlsy_api_token'); $old_crawlsy_token = get_option('crawlsy_api_token');
$old_dutchie_token = get_option('dutchie_api_token'); $old_dutchie_token = get_option('dutchie_api_token');