From 302e824ee4c44bc809d1e656492e44520289c212 Mon Sep 17 00:00:00 2001 From: Andrew Arz <149685528+aarz-snl@users.noreply.github.com> Date: Mon, 16 Dec 2024 13:50:49 -0500 Subject: [PATCH 1/2] Hotfix awarz 531 remove inline comments (#536) Remove inline comments from quadlets --- quadlet/lme-fleet-server.container | 2 +- quadlet/lme-kibana.container | 2 +- quadlet/lme-wazuh-manager.container | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/quadlet/lme-fleet-server.container b/quadlet/lme-fleet-server.container index f2a16fb0..227bdf22 100644 --- a/quadlet/lme-fleet-server.container +++ b/quadlet/lme-fleet-server.container @@ -7,7 +7,7 @@ PartOf=lme.service [Service] Restart=always -TimeoutStartSec=5400 #30 minutes, helps ensure does not fail due to health check +TimeoutStartSec=5400 Environment=ANSIBLE_VAULT_PASSWORD_FILE=/etc/lme/pass.sh [Install] diff --git a/quadlet/lme-kibana.container b/quadlet/lme-kibana.container index a51cd176..7366322e 100644 --- a/quadlet/lme-kibana.container +++ b/quadlet/lme-kibana.container @@ -10,7 +10,7 @@ WantedBy=default.target lme.service [Service] Restart=always -TimeoutStartSec=5400 #30 minutes, helps ensure does not fail due to health check +TimeoutStartSec=5400 Environment=ANSIBLE_VAULT_PASSWORD_FILE=/etc/lme/pass.sh [Container] diff --git a/quadlet/lme-wazuh-manager.container b/quadlet/lme-wazuh-manager.container index 09110dd6..33622a14 100644 --- a/quadlet/lme-wazuh-manager.container +++ b/quadlet/lme-wazuh-manager.container @@ -9,7 +9,7 @@ PartOf=lme.service Restart=always LimitNOFILE=655360 Environment=ANSIBLE_VAULT_PASSWORD_FILE=/etc/lme/pass.sh -TimeoutStartSec=5400 #30 minutes, helps ensure does not fail due to health check +TimeoutStartSec=5400 [Install] WantedBy=default.target lme.service From 0d19788f80feeb020995e961bb3b0b2ecec633d9 Mon Sep 17 00:00:00 2001 From: mitchelbaker-cisa <149098823+mitchelbaker-cisa@users.noreply.github.com> Date: Tue, 17 Dec 2024 22:06:41 +0000 Subject: [PATCH 2/2] Update the build release workflow (#539) * Update build_release.yaml * Update workflow permissions * Update workflow permissions * Update build_release.yaml --- .github/workflows/build_release.yaml | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build_release.yaml b/.github/workflows/build_release.yaml index 22cb10cf..a7a2d110 100644 --- a/.github/workflows/build_release.yaml +++ b/.github/workflows/build_release.yaml @@ -8,6 +8,9 @@ on: name: Build Release +permissions: + contents: write + jobs: build-release: runs-on: ubuntu-latest @@ -23,27 +26,17 @@ jobs: - name: Build Assets run: git ls-files | zip LME-${{ inputs.version }}.zip -@ - - name: Build Changelog - id: release - uses: mikepenz/release-changelog-builder-action@v4.1.1 - with: - toTag: "release-${{ inputs.version }}" - configuration: ".github/changelog-configuration.json" - failOnError: true - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Create Draft Release + - name: Create Draft Release uses: softprops/action-gh-release@v0.1.15 with: name: LME v${{ inputs.version }} tag_name: v${{ inputs.version }} - body: | + body: | ## [${{ inputs.version }}] - Timberrrrr! - ${{ env.date }} - ${{ steps.release.outputs.changelog }} + append_body: true files: LME-${{ inputs.version }}.zip draft: true prerelease: false discussion_category_name: "Announcements" - generate_release_notes: false + generate_release_notes: true fail_on_unmatched_files: true