Skip to content

Commit 7ad5192

Browse files
committed
reuse more with added Ansible functionality
1 parent 5109806 commit 7ad5192

File tree

1 file changed

+15
-93
lines changed

1 file changed

+15
-93
lines changed

.github/workflows/ansible.yml

Lines changed: 15 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ env:
3232
GO_VERSION: 1.23.10
3333

3434
jobs:
35-
3635
cross-compile:
3736
strategy:
3837
matrix:
@@ -68,105 +67,28 @@ jobs:
6867
strategy:
6968
matrix:
7069
OS: [ "windows-2025" ]
71-
env:
70+
uses: ./.github/workflows/agent-bundle-windows.yml
71+
with:
72+
OS: ${{ matrix.OS }}
7273
PIP_CACHE_DIR: ${{ github.workspace }}/.cache/pip
73-
steps:
74-
- uses: actions/checkout@v4
75-
76-
- uses: actions/cache@v4
77-
with:
78-
path: ${{ env.PIP_CACHE_DIR }}
79-
key: agent-bundle-windows-pip-${{ hashFiles('packaging/bundle/collectd-plugins.yaml', 'packaging/bundle/scripts/requirements.txt') }}
80-
81-
- run: ./packaging/bundle/scripts/windows/make.ps1 bundle
82-
83-
- uses: actions/upload-artifact@v4
84-
with:
85-
name: agent-bundle-windows-${{ matrix.OS }}
86-
path: ./dist/agent-bundle_windows_amd64.zip
8774

8875
msi-custom-actions:
89-
runs-on: windows-2025
9076
needs: lint
91-
steps:
92-
- name: Check out the codebase.
93-
uses: actions/checkout@v4
94-
95-
- name: Uninstall default WiX
96-
run: choco uninstall wixtoolset
97-
98-
- name: Install WiX 3.14.0
99-
run: choco install wixtoolset --version 3.14.0 --allow-downgrade --force
100-
101-
- name: Build Custom Actions
102-
working-directory: packaging/msi/SplunkCustomActions
103-
run: |
104-
dotnet test ./test/SplunkCustomActionsTests.csproj -c Release
105-
dotnet publish ./src/SplunkCustomActions.csproj -c Release -o ./bin/Release
106-
107-
- name: Package Custom Actions
108-
run: |
109-
$WixPath = "${Env:ProgramFiles(x86)}\WiX Toolset v3.14"
110-
$sfxcaDll = "${WixPath}\SDK\x64\sfxca.dll"
111-
$Env:PATH = "${WixPath}\SDK;" + $Env:PATH
112-
$customActionDir = "${PWD}\packaging\msi\SplunkCustomActions"
113-
$customActionBinDir = "${customActionDir}\bin\Release"
114-
MakeSfxCA.exe "${PWD}\dist\SplunkCustomActions.CA.dll" `
115-
"${sfxcaDll}" `
116-
"${customActionBinDir}\SplunkCustomActions.dll" `
117-
"${customActionBinDir}\Microsoft.Deployment.WindowsInstaller.dll" `
118-
"${customActionDir}\src\CustomAction.config"
119-
120-
- uses: actions/upload-artifact@v4
121-
with:
122-
name: msi-custom-actions
123-
path: ./dist/SplunkCustomActions.CA.dll
77+
strategy:
78+
matrix:
79+
OS: [ "windows-2025" ]
80+
uses: ./.github/workflows/msi-custom-actions.yml
81+
with:
82+
OS: ${{ matrix.OS }}
12483

12584
msi-build:
126-
runs-on: ubuntu-24.04
127-
env:
128-
WINDOWS_VER: "windows-2025"
12985
needs: [cross-compile, agent-bundle-windows, msi-custom-actions]
130-
steps:
131-
- name: Check out the codebase.
132-
uses: actions/checkout@v4
133-
with:
134-
fetch-depth: 0
135-
136-
- name: Downloading binaries-windows_amd64
137-
uses: actions/download-artifact@v4
138-
with:
139-
name: binaries-windows_amd64
140-
path: ./bin
141-
142-
- name: Set up Go
143-
uses: actions/setup-go@v5
144-
with:
145-
go-version: ${{ env.GO_VERSION }}
146-
cache-dependency-path: '**/go.sum'
147-
148-
- name: Downloading agent-bundle-windows
149-
uses: actions/download-artifact@v4
150-
with:
151-
name: agent-bundle-windows-${{ env.WINDOWS_VER }}
152-
path: ./dist
153-
154-
- name: Downloading msi-custom-actions
155-
uses: actions/download-artifact@v4
156-
with:
157-
name: msi-custom-actions
158-
path: ./packaging/msi/SplunkCustomActions/bin/Release
159-
160-
- name: Build MSI
161-
run: |
162-
mkdir -p dist
163-
make msi SKIP_COMPILE=true VERSION=""
164-
165-
- name: Uploading msi build artifacts
166-
uses: actions/upload-artifact@v4
167-
with:
168-
name: msi-build
169-
path: ./dist/*.msi
86+
strategy:
87+
matrix:
88+
OS: [ "windows-2025" ]
89+
uses: ./.github/workflows/msi-build.yml
90+
with:
91+
OS: ${{ matrix.OS }}
17092

17193
lint:
17294
name: Lint

0 commit comments

Comments
 (0)