Skip to content

Commit

Permalink
Merge branch '2023.11' into 2024.11
Browse files Browse the repository at this point in the history
  • Loading branch information
byteplow committed Jan 25, 2024
2 parents 831db41 + 9d9ab5d commit 19464b6
Show file tree
Hide file tree
Showing 6 changed files with 67 additions and 65 deletions.
34 changes: 5 additions & 29 deletions ci/gitlab-ci/deploy_jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,25 +157,6 @@ release-to-gitlab:
timeout: 20m
interruptible: true

push-to-vpackages:
extends: .abstract_jobs.docker
stage: deploy
before_script:
- apk add openssh
- eval $(ssh-agent -s)
- echo "$VPACKAGES_DEPLOY_KEY" | tr -d '\r' | ssh-add -
script:
- !reference [.lib, script]
- packaging_push_to_vpackages
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_LABELS =~ /push-to-vpackages/
when: manual
- if: $PUSH_TO_VPACKAGES != "true"
when: never
- if: $CI_COMMIT_TAG
timeout: 20m
interruptible: false

release-packages-to-gitlab:
extends: .abstract_jobs.docker
stage: deploy
Expand Down Expand Up @@ -257,7 +238,8 @@ mkdocs-deploy:
- if: $MKDOCS_DEPLOY == "false"
when: never
- if: $MKDOCS_DEPLOY == "true"
- if: $PIPELINE_TYPE =~ /mkdocs-deploy/
# mkdocs-deploy is triggered by a nightly pipeline and if docs changes. Maybe we only need one of them?
- if: $PIPELINE_TYPE =~ /mkdocs-deploy/ && $CI_COMMIT_REF_NAME == "2024.11"
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME == "2024.11"
changes:
- docs/**/*
Expand All @@ -269,16 +251,10 @@ update-version-check:
variables:
TRIGGER_JOBS: update-version
PACKAGE_STRING: ${CI_COMMIT_TAG}
CODE_NAME: ${CODENAME}
trigger:
project: tine20/versionCheck
strategy: depend
branch: pu/mm/cicd # only for testing
branch: master
rules:
- if: $CI_COMMIT_TAG && $MAJOR_COMMIT_REF_NAME == "tine20.com/2022.11"
variables:
VERSION: "be"
CODE_NAME: ${CODENAME}
- if: $CI_COMMIT_TAG && $MAJOR_COMMIT_REF_NAME == "2022.11"
variables:
VERSION: "org"
CODE_NAME: ${MAJOR_COMMIT_REF_NAME}
- if: $CI_COMMIT_TAG && $MAJOR_COMMIT_REF_NAME == "2023.11"
18 changes: 0 additions & 18 deletions ci/gitlab-ci/lib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -551,24 +551,6 @@
matrix_send_message $MATRIX_ROOM "🟢 Packages for ${version} have been released to github."
}
packaging_push_to_vpackages() {
customer=$(repo_get_customer_for_branch ${MAJOR_COMMIT_REF_NAME})
version=${CI_COMMIT_TAG:-$(packaging_gitlab_get_version_for_pipeline_id)}
release=$(echo ${version} | sed sI-I~Ig)
echo "publishing ${release} (${version}) for ${customer} from ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${customer}/${version}/all.tar"
if ! ssh ${VPACKAGES_SSH_URL} -o StrictHostKeyChecking=no -C "sudo -u www-data curl ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${customer}/${version}/all.tar -o /tmp/${release}-source-${customer}.tar"; then
echo "Failed to download packages to vpackages"
return 1
fi
if ! ssh ${VPACKAGES_SSH_URL} -o StrictHostKeyChecking=no -C "sudo -u www-data /srv/packages.tine20.com/www/scripts/importTine20Repo.sh /tmp/${release}-source-${customer}.tar; sudo -u www-data rm -f /tmp/${release}-source-${customer}.tar"; then
echo "Failed to import package to repo"
return 1
fi
}
packaging_get_version() {
if test "$CI_COMMIT_TAG"; then
echo "$CI_COMMIT_TAG"
Expand Down
18 changes: 0 additions & 18 deletions ci/gitlab-ci/lib/scripts/packaging.sh
Original file line number Diff line number Diff line change
Expand Up @@ -146,24 +146,6 @@ packaging_push_package_to_github() {
matrix_send_message $MATRIX_ROOM "🟢 Packages for ${version} have been released to github."
}

packaging_push_to_vpackages() {
customer=$(repo_get_customer_for_branch ${MAJOR_COMMIT_REF_NAME})
version=${CI_COMMIT_TAG:-$(packaging_gitlab_get_version_for_pipeline_id)}
release=$(echo ${version} | sed sI-I~Ig)

echo "publishing ${release} (${version}) for ${customer} from ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${customer}/${version}/all.tar"

if ! ssh ${VPACKAGES_SSH_URL} -o StrictHostKeyChecking=no -C "sudo -u www-data curl ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${customer}/${version}/all.tar -o /tmp/${release}-source-${customer}.tar"; then
echo "Failed to download packages to vpackages"
return 1
fi

if ! ssh ${VPACKAGES_SSH_URL} -o StrictHostKeyChecking=no -C "sudo -u www-data /srv/packages.tine20.com/www/scripts/importTine20Repo.sh /tmp/${release}-source-${customer}.tar; sudo -u www-data rm -f /tmp/${release}-source-${customer}.tar"; then
echo "Failed to import package to repo"
return 1
fi
}

packaging_get_version() {
if test "$CI_COMMIT_TAG"; then
echo "$CI_COMMIT_TAG"
Expand Down
44 changes: 44 additions & 0 deletions tine20/Bookmarks/Frontend/Json.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?php

/**
* JSON interface for bookmarks
*
* @package Bookmarks
* @subpackage Frontend
*/
class Bookmarks_Frontend_Json extends Tinebase_Frontend_Json_Abstract
{
protected $_applicationName = 'Bookmarks';
protected $_configuredModels = [
Bookmarks_Model_Bookmark::MODEL_NAME_PART
];

/**
* Returns registry data
* @return array
*/
public function getRegistryData(): array
{
$containers = $this->getDefaultBookmarksContainers();
$registryData = array(
'defaultBookmarksContainer' => reset($containers)
);
return array_merge($registryData, $this->_getImportDefinitionRegistryData());
}

/**
* get default bookmarks container
*
* @return array
*/
public function getDefaultBookmarksContainers(): array
{
$user = Tinebase_Core::getUser();
try {
$defaultBookmarksContainers = Tinebase_Container::getInstance()->getPersonalContainer($user, Bookmarks_Model_Bookmark::class, $user, Tinebase_Model_Grants::GRANT_ADMIN);
} catch (Tinebase_Exception_NotFound $e) {
return [];
}
return $defaultBookmarksContainers->toArray();
}
}
1 change: 1 addition & 0 deletions tine20/Bookmarks/js/Bookmarks.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

require('../styles/bookmarks.less')
require('./BookmarkGridPanel');
require('./Model');

Tine.widgets.grid.RendererManager.register('Bookmarks', 'Bookmark', 'url', (url, metadata, record) => {
const link = Tine.Tinebase.common.getUrl() + '/Bookmarks/openBookmark/' + record.getId()
Expand Down
17 changes: 17 additions & 0 deletions tine20/Bookmarks/js/Model.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Ext.ns('Tine.Bookmarks.Model');

/**
* @namespace Tine.Bookmarks.Model
* @class Tine.Bookmarks.Model.BookmarkMixin
*
*/
Tine.Bookmarks.Model.BookmarkMixin = {
statics: {
getDefaultData: function () {
const dc = Tine.Bookmarks.registry.get('defaultBookmarksContainer');
return _.assign({
container_id: dc,
});
}
}
}

0 comments on commit 19464b6

Please sign in to comment.