Merge branch 'release/2.0.1'

CPS-IT · Oct 23, 2024 · c53aac9 · c53aac9
2 parents 273dea3 + 327c005
commit c53aac9
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 11 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -0,0 +1,75 @@
+name: Release
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  # Job: Create release
+  release:
+    if: startsWith(github.ref, 'refs/tags/')
+    runs-on: ubuntu-latest
+    outputs:
+      release-notes-url: ${{ steps.create-release.outputs.html_url }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      # Check if tag is valid
+      - name: Check tag
+        run: |
+          if ! [[ ${{ github.ref }} =~ ^refs/tags/[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}$ ]]; then
+            exit 1
+          fi
+
+      # Create release
+      - name: Create release
+        id: create-release
+        uses: ncipollo/release-action@v1
+        with:
+          generateReleaseNotes: true
+
+  # Job: Publish on TER
+  ter-publish:
+    if: startsWith(github.ref, 'refs/tags/')
+    needs: [release]
+    runs-on: ubuntu-latest
+    env:
+      TYPO3_EXTENSION_KEY: admiral_cloud_connector
+      TYPO3_API_TOKEN: ${{ secrets.TYPO3_API_TOKEN }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      # Check if tag is valid
+      - name: Check tag
+        run: |
+          if ! [[ ${{ github.ref }} =~ ^refs/tags/[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}$ ]]; then
+            exit 1
+          fi
+
+      # Prepare version
+      - id: get-version
+        run: echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
+      - id: get-comment
+        run: echo "comment=See release notes at ${{ needs.release.outputs.release-notes-url }}" >> $GITHUB_OUTPUT
+
+      # Prepare environment
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.1
+          extensions: intl, mbstring, json, zip, curl
+          tools: composer:v2
+          coverage: none
+
+      # Install tailor
+      - name: Install tailor
+        run: composer global require typo3/tailor --prefer-dist --no-progress --no-suggest
+
+      - name: Publish to TER
+        run: |
+          php ~/.composer/vendor/bin/tailor set-version "${{ steps.get-version.outputs.version }}"
+          php ~/.composer/vendor/bin/tailor ter:publish --comment "${{ steps.get-comment.outputs.comment }}" "${{ steps.get-version.outputs.version }}"
diff --git a/Classes/EventListener/InstallListener.php b/Classes/EventListener/InstallListener.php
@@ -67,8 +67,7 @@ public function createAdmiralCloudFileStorage(AfterPackageActivationEvent $event
             'tstamp' => $GLOBALS['EXEC_TIME'],
             'title' => 'AdmiralCloud',
             'description' => 'Automatically created during the installation of EXT:admiral_cloud_connector',
-            'path' => '',
-            'base' => $storageUid,
+            'identifier' => $storageUid .':',
         ];
 
         $dbConnection = GeneralUtility::makeInstance(ConnectionPool::class)

diff --git a/Classes/Slot/InstallSlot.php b/Classes/Slot/InstallSlot.php
@@ -64,8 +64,7 @@ public function createAdmiralCloudFileStorage(string $extensionKey, InstallUtili
             'tstamp' => $GLOBALS['EXEC_TIME'],
             'title' => 'AdmiralCloud',
             'description' => 'Automatically created during the installation of EXT:admiral_cloud_connector',
-            'path' => '',
-            'base' => $storageUid,
+            'identifier' => $storageUid . ':',
         ];
 
         $dbConnection = GeneralUtility::makeInstance(ConnectionPool::class)

diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg
@@ -1,6 +1,6 @@
 [general]
 project = Admiral Cloud Connector
-release = 1.0.20
+release = 2.0.1
 copyright = since 2020 by coding. powerful. systems. CPS GmbH
 author = Steffen Mevius
 

diff --git a/Documentation/conf.py b/Documentation/conf.py
@@ -9,7 +9,7 @@
 project = 'AdmiralCloud Connector'
 copyright = '2022, coding. powerful. systems. CPS GmbH'
 author = 'coding. powerful. systems. CPS GmbH'
-release = '2.0.0'
+release = '2.0.1'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

diff --git a/composer.json b/composer.json
@@ -11,9 +11,9 @@
     "php": ">= 8.1",
     "guzzlehttp/guzzle": "*",
     "guzzlehttp/oauth-subscriber": "*",
-    "typo3/cms-core": "^12.4",
-    "typo3/cms-fluid": "^12.4",
-    "typo3/cms-filemetadata": "^12.4"
+    "typo3/cms-core": "^12.4.22",
+    "typo3/cms-fluid": "^12.4.22",
+    "typo3/cms-filemetadata": "^12.4.22"
   },
   "autoload": {
     "psr-4": {

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -11,12 +11,12 @@
     'uploadfolder' => '1',
     'createDirs' => '',
     'clearCacheOnLoad' => 1,
-    'version' => '2.0.0',
+    'version' => '2.0.1',
     'constraints' =>
         array (
             'depends' =>
                 array (
-                    'typo3' => '12.4.0-12.4.99',
+                    'typo3' => '12.4.22-12.4.99',
                 ),
             'conflicts' =>
                 array (