diff --git a/docker-bake-leaf-version-override.json b/docker-bake-leaf-version-override.json index c1c1884..b90b24e 100644 --- a/docker-bake-leaf-version-override.json +++ b/docker-bake-leaf-version-override.json @@ -1,7 +1,7 @@ { "variable": { "LEAF_VERSION": { - "default": "3.0.18" + "default": "3.0.19" } } } \ No newline at end of file diff --git a/docker/drupal/rootfs/var/www/drupal/composer.lock b/docker/drupal/rootfs/var/www/drupal/composer.lock index c3877fb..2436ea8 100644 --- a/docker/drupal/rootfs/var/www/drupal/composer.lock +++ b/docker/drupal/rootfs/var/www/drupal/composer.lock @@ -25835,6 +25835,7 @@ "drupal/bibcite": 10, "drupal/citation_select": 10, "drupal/config_distro": 15, + "drupal/context": 5, "drupal/facets_custom_label": 5, "drupal/facets_date_range": 10, "drupal/filefield_paths": 20, @@ -25855,12 +25856,12 @@ "drupal/views_field_view": 10, "islandora-rdm/islandora_fits": 20, "islandora/openseadragon": 20, - "mjordan/islandora_workbench_integration": 20, - "drupal/context": 5 + "mjordan/islandora_bagger_integration": 20, + "mjordan/islandora_workbench_integration": 20 }, "prefer-stable": true, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/docker/drupal/rootfs/var/www/drupal/config/sync/core.extension.yml b/docker/drupal/rootfs/var/www/drupal/config/sync/core.extension.yml index a1e0bd1..b951cf7 100644 --- a/docker/drupal/rootfs/var/www/drupal/config/sync/core.extension.yml +++ b/docker/drupal/rootfs/var/www/drupal/config/sync/core.extension.yml @@ -1,6 +1,6 @@ -_core: - default_config_hash: R4IF-ClDHXxblLcG0L7MgsLvfBIMAvi_skumNFQwkDc module: + getjwtonlogin: 0 + islandora_bagger_integration: 0 action: 0 addtoany: 0 admin_toolbar: 0 @@ -80,7 +80,6 @@ module: fontawesome: 0 form_options_attributes: 0 geolocation: 0 - getjwtonlogin: 0 gnode: 0 gprofile: 0 group: 0 @@ -93,7 +92,6 @@ module: inline_entity_form: 0 islandora: 0 islandora_audio: 0 - islandora_bagger_integration: 0 islandora_breadcrumbs: 0 islandora_core_feature: 0 islandora_fits: 0 @@ -223,6 +221,8 @@ module: views: 10 paragraphs: 11 minimal: 1000 +_core: + default_config_hash: R4IF-ClDHXxblLcG0L7MgsLvfBIMAvi_skumNFQwkDc theme: bootstrap_barrio: 0 seven: 0 diff --git a/docker/drupal/scripts/auto.sh b/docker/drupal/scripts/auto.sh index ad413ce..e5e7545 100644 --- a/docker/drupal/scripts/auto.sh +++ b/docker/drupal/scripts/auto.sh @@ -1,37 +1,3 @@ - -BRANCH=$(git branch --show-current) -if [ "${BRANCH}" != 'main' ]; then - echo "Not on the main branch: ${BRANCH}" - # git switch main && git pull - exit 1 -fi - -# Get local LEAF version -LEAF_VERSION_LOCAL=$(jq -r '.variable.LEAF_VERSION.default' docker-bake-leaf-version-override.json) -echo "LOCAL LEAF: ${LEAF_VERSION_LOCAL}" - -# Get remote LEAF tag -LEAF_VERSION=$( - git ls-remote --tags https://gitlab.com/calincs/cwrc/leaf/leaf-base-i8.git | \ - awk -F/ '{print $NF}' | \ - grep -E '^v?[0-9]+\.[0-9]+\.[0-9]+$' | \ - sort -V | \ - tail -n1 -) -echo "Remote LEAF: ${LEAF_VERSION}" - -# Test if LEAF version update needed -if [ "${LEAF_VERSION_LOCAL}" = "${LEAF_VERSION}" ]; then - echo "Version up-to-date ${LEAF_VERSION_LOCAL}" - exit 2 -else - echo "Starting LEAF version update from ${LEAF_VERSION_LOCAL} to ${LEAF_VERSION}" - git checkout -b "leaf_update_${LEAF_VERSION}" - update_leaf_version_test ${LEAF_VERSION} - update_leaf_version ${LEAF_VERSION} - git commit -a -m "Bump LEAF version from ${LEAF_VERSION_LOCAL} to ${LEAF_VERSION}" && git push -fi - # function update_leaf_version_test() { echo $1 @@ -67,3 +33,42 @@ function update_leaf_version() { docker cp $id:/var/www/drupal/composer.lock docker/drupal/rootfs/var/www/drupal/ docker rm -v $id } + + + +BRANCH=$(git branch --show-current) +if [ "${BRANCH}" != 'main' ]; then + echo "Not on the main branch: ${BRANCH}" + # git switch main && git pull + exit 1 +fi + +# Get local LEAF version +LEAF_VERSION_LOCAL=$(jq -r '.variable.LEAF_VERSION.default' docker-bake-leaf-version-override.json) +echo "LOCAL LEAF: ${LEAF_VERSION_LOCAL}" + +# Get remote LEAF tag +LEAF_VERSION=$( + git ls-remote --tags https://gitlab.com/calincs/cwrc/leaf/leaf-base-i8.git | \ + awk -F/ '{print $NF}' | \ + grep -E '^v?[0-9]+\.[0-9]+\.[0-9]+$' | \ + sort -V | \ + tail -n1 +) +echo "Remote LEAF: ${LEAF_VERSION}" + +# Test if LEAF version update needed +if [ "${LEAF_VERSION_LOCAL}" = "${LEAF_VERSION}" ]; then + echo "Version up-to-date ${LEAF_VERSION_LOCAL}" + exit 2 +elif [ -z "${LEAF_VERSION_LOCAL}" ]; then + echo "LEAF_VERSION_LOCAL missing; check if jq is installed or in the wrong (non-root directory)" + exit 2 +else + echo "Starting LEAF version update from ${LEAF_VERSION_LOCAL} to ${LEAF_VERSION}" + git checkout -b "leaf_update_${LEAF_VERSION}" + update_leaf_version_test ${LEAF_VERSION} + update_leaf_version ${LEAF_VERSION} + git commit -a -m "Bump LEAF version from ${LEAF_VERSION_LOCAL} to ${LEAF_VERSION}" && git push +fi +