Simplify shopware

hipay · Nov 4, 2024 · 9cb4904 · 9cb4904
1 parent 747ddcf
commit 9cb4904
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/.github/workflows/slack-message.yml b/.github/workflows/slack-message.yml
@@ -32,8 +32,7 @@ jobs:
           const { tickets } = require('./artifact.json');
 
           (async () => {
-            const shopwareMajorVersion = /^1\..+/.test("${{ github.event.release.tag_name }}") ? "4" : "5";
-            const project = "HiPay Enterprise Shopware 6." + shopwareMajorVersion;
+            const project = "HiPay Enterprise Shopware 6.5";
             const payload = {
               channel: "${{ vars.SLACK_CHANNEL_ID }}",
               blocks: [

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -334,8 +334,7 @@ get-jira-tickets:
       node <<EOF
       (async () => {
         try {
-          const shopwareMajorVersion = /^1\..+/.test("${CI_COMMIT_TAG}") ? "4" : "5";
-          const gitlabResponse = await fetch("${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/merge_requests?state=merged&target_branch=develop-6-" + shopwareMajorVersion + "&milestone=${CI_COMMIT_TAG}", {
+          const gitlabResponse = await fetch("${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/merge_requests?state=merged&target_branch=develop-6-5&milestone=${CI_COMMIT_TAG}", {
             method: "GET",
             headers: {
               "Private-Token": "$GITLAB_API_TOKEN"