Merge branch 'master' into social

asyncapi · Nov 18, 2023 · bc37654 · bc37654
2 parents 6c6a0c6 + deeb2a5
commit bc37654
Show file tree

Hide file tree

Showing 10 changed files with 1,425 additions and 752 deletions.
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -45,7 +45,7 @@ jobs:
         env:
           GITHUB_TOKEN: "${{ secrets.GH_TOKEN }}"
           GITHUB_LOGIN: asyncapi-bot
-          MERGE_LABELS: ""
+          MERGE_LABELS: "!do-not-merge"
           MERGE_METHOD: "squash"
           MERGE_COMMIT_MESSAGE: "{pullRequest.title} (#{pullRequest.number})"
           MERGE_RETRIES: "20"

diff --git a/config/meetings.json b/config/meetings.json
@@ -13,13 +13,6 @@
     "banner": "",
     "date": "2023-08-31T14:30:00.000Z"
   },
-  {
-    "title": "Community Meeting",
-    "calLink": "https://www.google.com/calendar/event?eid=YmlybTZwODdmMzBnNGg0b3J1OWxmdnBxNmMgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
-    "url": "https://github.com/asyncapi/community/issues/818",
-    "banner": "https://user-images.githubusercontent.com/40604284/256949583-958c34c8-4256-4ac5-852b-e00ec094fad0.png",
-    "date": "2023-08-08T16:00:00.000Z"
-  },
   {
     "title": "Community Meeting",
     "calLink": "https://www.google.com/calendar/event?eid=Z3YzNDRwamprYzMwNTluYTdtNG1iaHA5NjggY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",

diff --git a/config/newsroom_videos.json b/config/newsroom_videos.json
@@ -1,4 +1,10 @@
 [
+  {
+    "image_url": "https://i.ytimg.com/vi/KDort611FNg/hqdefault.jpg",
+    "title": "Community Meeting(November 14th, 2023)",
+    "description": "https://github.com/asyncapi/community/issues/917.",
+    "videoId": "KDort611FNg"
+  },
   {
     "image_url": "https://i.ytimg.com/vi/Vm4ZKFb2PVE/hqdefault.jpg",
     "title": "Community Meeting(October 31th, 2023)",
@@ -22,11 +28,5 @@
     "title": "Hacktoberfest (October 6th, 2023)",
     "description": "https://github.com/asyncapi/community/issues/894.",
     "videoId": "KTnFoXY_evs"
-  },
-  {
-    "image_url": "https://i.ytimg.com/vi/qjMojQ-fFew/hqdefault.jpg",
-    "title": "Spec 3.0 docs meeting (September 28, 2023)",
-    "description": "https://github.com/asyncapi/community/issues/885.",
-    "videoId": "qjMojQ-fFew"
   }
 ]
diff --git a/cypress/test/scripts/build-newsroom-videos.cy.js b/cypress/test/scripts/build-newsroom-videos.cy.js
@@ -44,7 +44,7 @@ describe('Newsroom Videos', () => {
     }).as('getYoutubeVideos');
 
     // Manually trigger the function
-    await buildNewsroomVideos().then((videoData) => {
+    cy.invoke(buildNewsroomVideos()).then((videoData) => {
       expect(videoData).to.exist;
     });
   });