Skip to content

Commit 2b64aa3

Browse files
committed
fix formatting of workflows: name of job must be under "jobs:" block
1 parent 11bf6b6 commit 2b64aa3

File tree

2 files changed

+58
-56
lines changed

2 files changed

+58
-56
lines changed

.github/workflows/agent-bundle-windows.yml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,24 @@ on:
99
PIP_CACHE_DIR:
1010
required: true
1111
type: string
12+
1213
env:
1314
GO_VERSION: 1.23.10
1415

16+
jobs:
17+
agent-bundle-windows:
18+
runs-on: ${{ inputs.OS }}
19+
steps:
20+
- uses: actions/checkout@v4
1521

16-
agent-bundle-windows:
17-
runs-on: ${{ inputs.OS }}
18-
steps:
19-
- uses: actions/checkout@v4
20-
21-
- uses: actions/cache@v4
22-
with:
23-
path: ${{ inputs.PIP_CACHE_DIR }}
24-
key: agent-bundle-windows-pip-${{ hashFiles('packaging/bundle/collectd-plugins.yaml', 'packaging/bundle/scripts/requirements.txt') }}
22+
- uses: actions/cache@v4
23+
with:
24+
path: ${{ inputs.PIP_CACHE_DIR }}
25+
key: agent-bundle-windows-pip-${{ hashFiles('packaging/bundle/collectd-plugins.yaml', 'packaging/bundle/scripts/requirements.txt') }}
2526

26-
- run: ./packaging/bundle/scripts/windows/make.ps1 bundle
27+
- run: ./packaging/bundle/scripts/windows/make.ps1 bundle
2728

28-
- uses: actions/upload-artifact@v4
29-
with:
30-
name: agent-bundle-windows-${{ inputs.OS }}
31-
path: ./dist/agent-bundle_windows_amd64.zip
29+
- uses: actions/upload-artifact@v4
30+
with:
31+
name: agent-bundle-windows-${{ inputs.OS }}
32+
path: ./dist/agent-bundle_windows_amd64.zip

.github/workflows/msi-build.yml

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -10,45 +10,46 @@ on:
1010
env:
1111
GO_VERSION: 1.23.10
1212

13-
msi-build:
14-
runs-on: ubuntu-24.04
15-
steps:
16-
- name: Check out the codebase.
17-
uses: actions/checkout@v4
18-
with:
19-
fetch-depth: 0
20-
21-
- name: Downloading binaries-windows_amd64
22-
uses: actions/download-artifact@v4
23-
with:
24-
name: binaries-windows_amd64
25-
path: ./bin
26-
27-
- name: Set up Go
28-
uses: actions/setup-go@v5
29-
with:
30-
go-version: ${{ env.GO_VERSION }}
31-
cache-dependency-path: '**/go.sum'
32-
33-
- name: Downloading agent-bundle-windows
34-
uses: actions/download-artifact@v4
35-
with:
36-
name: agent-bundle-windows-${{ inputs.OS }}
37-
path: ./dist
38-
39-
- name: Downloading msi-custom-actions
40-
uses: actions/download-artifact@v4
41-
with:
42-
name: msi-custom-actions
43-
path: ./packaging/msi/SplunkCustomActions/bin/Release
44-
45-
- name: Build MSI
46-
run: |
47-
mkdir -p dist
48-
make msi SKIP_COMPILE=true VERSION=""
49-
50-
- name: Uploading msi build artifacts
51-
uses: actions/upload-artifact@v4
52-
with:
53-
name: msi-build-${{ inputs.OS }}
54-
path: ./dist/*.msi
13+
jobs:
14+
msi-build:
15+
runs-on: ubuntu-24.04
16+
steps:
17+
- name: Check out the codebase.
18+
uses: actions/checkout@v4
19+
with:
20+
fetch-depth: 0
21+
22+
- name: Downloading binaries-windows_amd64
23+
uses: actions/download-artifact@v4
24+
with:
25+
name: binaries-windows_amd64
26+
path: ./bin
27+
28+
- name: Set up Go
29+
uses: actions/setup-go@v5
30+
with:
31+
go-version: ${{ env.GO_VERSION }}
32+
cache-dependency-path: '**/go.sum'
33+
34+
- name: Downloading agent-bundle-windows
35+
uses: actions/download-artifact@v4
36+
with:
37+
name: agent-bundle-windows-${{ inputs.OS }}
38+
path: ./dist
39+
40+
- name: Downloading msi-custom-actions
41+
uses: actions/download-artifact@v4
42+
with:
43+
name: msi-custom-actions
44+
path: ./packaging/msi/SplunkCustomActions/bin/Release
45+
46+
- name: Build MSI
47+
run: |
48+
mkdir -p dist
49+
make msi SKIP_COMPILE=true VERSION=""
50+
51+
- name: Uploading msi build artifacts
52+
uses: actions/upload-artifact@v4
53+
with:
54+
name: msi-build-${{ inputs.OS }}
55+
path: ./dist/*.msi

0 commit comments

Comments
 (0)