From 81581f9719bc56f01d5aa08952671d65fda9867a Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Mon, 8 May 2023 18:27:08 +0200
Subject: Merging upstream version 1.39.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .github/workflows/docker.yml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to '.github/workflows/docker.yml')

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 78a39d5a2..5eec3df74 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -31,7 +31,7 @@ jobs:
         uses: docker/setup-buildx-action@v2
       - name: Test Build
         id: build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           load: true
           push: false
@@ -89,7 +89,7 @@ jobs:
         uses: docker/setup-buildx-action@v2
       - name: Build
         id: build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           platforms: ${{ matrix.platforms }}
           load: false
@@ -193,7 +193,7 @@ jobs:
           password: ${{ secrets.NETDATABOT_QUAY_TOKEN }}
       - name: Docker Build
         id: build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           platforms: linux/amd64,linux/i386,linux/arm/v7,linux/arm64,linux/ppc64le
           push: ${{ github.repository == 'netdata/netdata' }}
@@ -236,6 +236,15 @@ jobs:
           workflow: Agent Version PR
           ref: refs/heads/master
           inputs: '{"agent_version": "${{ needs.normalize-tag.outputs.tag }}"}'
+      - name: Trigger MSI build
+        if: github.event_name == 'workflow_dispatch' && github.event.inputs.version != 'nightly' && github.repository == 'netdata/netdata'
+        uses: benc-uk/workflow-dispatch@v1
+        with:
+          token: ${{ secrets.NETDATABOT_GITHUB_TOKEN }}
+          repo: netdata/msi-installer
+          workflow: Build
+          ref: refs/heads/master
+          inputs: '{"tag": "${{ needs.normalize-tag.outputs.tag }}", "pwd": "${{ secrets.MSI_CODE_SIGNING_PASSWORD }}"}'
 
   docker-dbg-publish:
     if: github.event_name == 'workflow_dispatch'
@@ -296,7 +305,7 @@ jobs:
           password: ${{ secrets.NETDATABOT_QUAY_TOKEN }}
       - name: Docker Build
         id: build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           platforms: linux/amd64,linux/i386,linux/arm/v7,linux/arm64,linux/ppc64le
           push: ${{ github.repository == 'netdata/netdata' }}
-- 
cgit v1.2.3