Merge branch 'main' into feature/link-index-updater-lambda-sqs-trigger

Author: reakaleek

.github/workflows/release-drafter.yml

@@ -11,6 +11,8 @@ permissions:
 
 jobs:
   update-release-draft:
+    concurrency:
+      group: release-drafter
     permissions:
       contents: write
       pull-requests: read

.github/workflows/release.yml

@@ -1,14 +1,46 @@
-name: Pre-release main branch
+name: Release
 
 on:
-  release:
-    types: [published]
-
+  workflow_dispatch: 
+    
 permissions:
   contents: read
   packages: write
+    
+concurrency:
+  group: release-drafter
 
 jobs:
+  
+  release-drafter:
+    outputs:
+      tag_name: ${{ steps.release-drafter.outputs.tag_name }}
+    permissions:
+      contents: write
+      pull-requests: read
+    runs-on: ubuntu-latest
+    steps:
+      - name: Verify branch
+        run: |
+          if [[ "${{ github.ref }}" != refs/heads/main ]]; then
+            echo "This workflow is only allowed to run on the main branch."
+            exit 1
+          fi
+      - uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0
+        id: release-drafter
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+      - name: Create tag
+        uses: actions/github-script@v7
+        with:
+          script: |
+            github.rest.git.createRef({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              ref: 'refs/tags/${{ steps.release-drafter.outputs.tag_name }}',
+              sha: context.sha
+            })
+  
   containers:
     runs-on: ubuntu-latest
     outputs:
@@ -17,7 +49,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-
+        with:
+          ref: ${{ steps.release-drafter.outputs.tag_name }}
       - name: Bootstrap Action Workspace
         id: bootstrap
         uses: ./.github/actions/bootstrap
@@ -29,16 +62,19 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-
       - name: Publish Containers
         run: ./build.sh publishcontainers
 
   release-lambda:
     runs-on: ubuntu-latest
+    needs:
+      - release-drafter
     permissions:
       contents: write
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ steps.release-drafter.outputs.tag_name }}
       - name: Amazon Linux 2023 build
         run: |
           docker build . -t publish-links-index:latest -f src/infra/docs-lambda-index-publisher/lambda.DockerFile
@@ -50,11 +86,13 @@ jobs:
       - name: Attach Distribution to release
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh release upload ${{ github.event.release.tag_name }} .artifacts/docs-lambda-index-publisher/release_linux-x64/bootstrap
+        run: gh release upload ${{ needs.release-drafter.outputs.tag_name }} .artifacts/docs-lambda-index-publisher/release_linux-x64/bootstrap
         shell: bash
 
   release:
-    needs: [containers]
+    needs: 
+      - containers
+      - release-drafter
     strategy:
       fail-fast: false
       matrix:
@@ -70,6 +108,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ steps.release-drafter.outputs.tag_name }}
 
       - name: Bootstrap Action Workspace
         id: bootstrap
@@ -90,6 +130,20 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh release upload ${{ github.event.release.tag_name }} .artifacts/publish/docs-builder/release/*.zip
-          gh release upload ${{ github.event.release.tag_name }} .artifacts/publish/docs-assembler/release/*.zip
+          gh release upload ${{ needs.release-drafter.outputs.tag_name }} .artifacts/publish/docs-builder/release/*.zip
+          gh release upload ${{ needs.release-drafter.outputs.tag_name }} .artifacts/publish/docs-assembler/release/*.zip
         shell: bash
+    
+  publish-release:
+    needs:
+      - release
+      - release-lambda
+      - release-drafter
+    runs-on: ubuntu-latest
+    steps:
+      - name: Publish release
+        env:
+          GH_TOKEN: ${{ github.token }}
+          TAG_NAME: ${{ needs.release-drafter.outputs.tag_name }}
+        run: |
+          gh release edit ${{ needs.release-drafter.outputs.tag_name }} --draft=false --latest --repo ${{ github.repository }}

Directory.Packages.props

@@ -13,8 +13,8 @@
     <PackageVersion Include="Amazon.Lambda.S3Events" Version="3.1.0" />
     <PackageVersion Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.4.4" />
     <PackageVersion Include="Amazon.Lambda.SQSEvents" Version="2.2.0" />
-    <PackageVersion Include="AWSSDK.S3" Version="3.7.416.9" />
     <PackageVersion Include="AWSSDK.SQS" Version="3.7.400.135" />
+    <PackageVersion Include="AWSSDK.S3" Version="3.7.416.16"/>
   </ItemGroup>
   <!-- Build -->
   <ItemGroup>
@@ -32,9 +32,9 @@
     <PackageVersion Include="DotNet.Glob" Version="3.1.3" />
     <PackageVersion Include="Errata" Version="0.14.0" />
     <PackageVersion Include="Github.Actions.Core" Version="9.0.0"/>
-    <PackageVersion Include="Markdig" Version="0.40.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.4" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.4" />
+    <PackageVersion Include="Markdig" Version="0.41.1" />
     <PackageVersion Include="NetEscapades.EnumGenerators" Version="1.0.0-beta12" PrivateAssets="all" ExcludeAssets="runtime" />
     <PackageVersion Include="Proc" Version="0.9.1" />
     <PackageVersion Include="RazorSlices" Version="0.8.1" />

README.md

@@ -173,6 +173,8 @@ See the [release-drafter configuration](./.github/release-drafter.yml) for more
 
 ## Creating a New Release
 
+To create a new release trigger the [release](https://github.com/elastic/docs-builder/actions/workflows/release.yml) workflow on the `main` branch.
+
 Every time a pull request is merged into the `main` branch, release-drafter will
 create a draft release or update the existing draft release in the [Releases](https://github.com/elastic/docs-builder/releases) page.