diff --git a/.github/workflows/4_bumper_repository.yml b/.github/workflows/4_bumper_repository.yml index aed9b1b7..a215726c 100644 --- a/.github/workflows/4_bumper_repository.yml +++ b/.github/workflows/4_bumper_repository.yml @@ -70,7 +70,7 @@ jobs: export GPG_TTY=$(tty) - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: # Using workflow-specific GITHUB_TOKEN because currently CI_WAZUHCI_BUMPER_TOKEN # doesn't have all the necessary permissions diff --git a/.github/workflows/Procedure_push_docker_images.yml b/.github/workflows/Procedure_push_docker_images.yml index 2b59f1e6..79080e47 100644 --- a/.github/workflows/Procedure_push_docker_images.yml +++ b/.github/workflows/Procedure_push_docker_images.yml @@ -302,19 +302,19 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: ref: ${{ inputs.docker_reference }} - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: docker/setup-qemu-action@v4 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: docker/setup-buildx-action@v4 - name: Configure aws credentials if: ${{ inputs.dev == true }} - uses: aws-actions/configure-aws-credentials@v4 + uses: aws-actions/configure-aws-credentials@v6 with: role-to-assume: ${{ secrets.AWS_IAM_DOCKER_ROLE }} aws-region: "${{ secrets.AWS_REGION }}" @@ -325,7 +325,7 @@ jobs: - name: Log in to Docker Hub if: ${{ inputs.dev == false }} - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_PASSWORD }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 5bae149f..c2f1a23d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -62,11 +62,12 @@ All notable changes to this project will be documented in this file. ### Changed -- None +- Updated GitHub actions version for wazuh-docker workflows. ([#2290](https://github.com/wazuh/wazuh-docker/pull/2290)) ### Fixed -- None +- Fix WAZUH_AGENT_GROUP variable ([#2262](https://github.com/wazuh/wazuh-docker/pull/2262)) +- Fix bumper script early exit ([#2261](https://github.com/wazuh/wazuh-docker/pull/2261)) ### Deleted diff --git a/tools/repository_bumper.sh b/tools/repository_bumper.sh index dd643c04..abf70f42 100644 --- a/tools/repository_bumper.sh +++ b/tools/repository_bumper.sh @@ -146,11 +146,6 @@ main() { # Get old version and stage get_old_version_and_stage - if [[ "${OLD_VERSION}" == "${VERSION}" && "${OLD_STAGE}" == "${STAGE}" ]]; then - echo "Version and stage are already up to date." | tee -a "${LOG_FILE}" - echo "No changes needed." | tee -a "${LOG_FILE}" - exit 0 - fi if [[ "${OLD_VERSION}" != "${VERSION}" ]]; then echo "Updating version from ${OLD_VERSION} to ${VERSION}" | tee -a "${LOG_FILE}" update_version_in_files "${VERSION}"