@@ -267,26 +267,20 @@ jobs:
267267 - name : Build UTMStack Collectors
268268 run : |
269269 echo "Building UTMStack Collector..."
270- cd ${{ github.workspace }}/utmstack-collector
271-
272- GOOS=linux GOARCH=amd64 go build -o utmstack_collector -v -ldflags "-X 'github.com/utmstack/UTMStack/utmstack-collector/config.REPLACE_KEY=${{ secrets.AGENT_SECRET_PREFIX }}'" .
270+ cd ${{ github.workspace }}/collectors/utmstack
271+ GOOS=linux GOARCH=amd64 go build -o utmstack_collector -v -ldflags "-X 'github.com/utmstack/UTMStack/collectors/utmstack/config.REPLACE_KEY=${{ secrets.AGENT_SECRET_PREFIX }}'" .
273272
274273 echo "Building UTMStack AS400 Collector..."
275-
276- cd ${{ github.workspace }}/as400
277- GOOS=linux GOARCH=amd64 go build -o utmstack_as400_collector_service -v -ldflags "-X 'github.com/utmstack/UTMStack/as400/config.REPLACE_KEY=${{ secrets.AGENT_SECRET_PREFIX }}'" .
278-
279- cd ${{ github.workspace }}/as400/updater
280- GOOS=linux GOARCH=amd64 go build -o utmstack_as400_updater_service -v .
274+ cd ${{ github.workspace }}/collectors/as400
275+ GOOS=linux GOARCH=amd64 go build -o utmstack_as400_collector_service -v -ldflags "-X 'github.com/utmstack/UTMStack/collectors/as400/config.REPLACE_KEY=${{ secrets.AGENT_SECRET_PREFIX }}'" .
281276
282277 - name : Upload collector binary as artifact
283278 uses : actions/upload-artifact@v4
284279 with :
285280 name : utmstack-collectors
286281 path : |
287- ${{ github.workspace }}/utmstack-collector/utmstack_collector
288- ${{ github.workspace }}/as400/utmstack_as400_collector_service
289- ${{ github.workspace }}/as400/updater/utmstack_as400_updater_service
282+ ${{ github.workspace }}/collectors/utmstack/utmstack_collector
283+ ${{ github.workspace }}/collectors/as400/utmstack_as400_collector_service
290284 retention-days : 1
291285
292286 build_agent_manager :
@@ -314,7 +308,7 @@ jobs:
314308 uses : actions/download-artifact@v4
315309 with :
316310 name : utmstack-collectors
317- path : ${{ github.workspace }}/utmstack- collector
311+ path : ${{ github.workspace }}/collector-binaries
318312
319313 - name : Download signed macOS agents from artifact
320314 uses : actions/download-artifact@v4
@@ -328,15 +322,14 @@ jobs:
328322 GOOS=linux GOARCH=amd64 go build -o agent-manager -v .
329323
330324 mkdir -p ./dependencies/collector
331- cp "${{ github.workspace }}/utmstack- collector/utmstack-collector /utmstack_collector" ./dependencies/collector/
332- cp "${{ github.workspace }}/utmstack-collector /version.json" ./dependencies/collector/
325+ cp "${{ github.workspace }}/collector-binaries /utmstack/utmstack_collector" ./dependencies/collector/
326+ cp "${{ github.workspace }}/collectors/ utmstack/version.json" ./dependencies/collector/
333327
334328 mkdir -p ./dependencies/collector/as400
335329 curl -sSL "https://storage.googleapis.com/utmstack-updates/dependencies/collector/as400-collector.jar" -o ./dependencies/collector/as400/as400-collector.jar
336330
337- cp "${{ github.workspace }}/as400/version.json" ./dependencies/collector/as400/
338- cp "${{ github.workspace }}/utmstack-collector/as400/utmstack_as400_collector_service" ./dependencies/collector/as400/
339- cp "${{ github.workspace }}/utmstack-collector/as400/updater/utmstack_as400_updater_service" ./dependencies/collector/as400/
331+ cp "${{ github.workspace }}/collectors/as400/version.json" ./dependencies/collector/as400/
332+ cp "${{ github.workspace }}/collector-binaries/as400/utmstack_as400_collector_service" ./dependencies/collector/as400/
340333
341334 mkdir -p ./dependencies/agent/
342335
0 commit comments