extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-02-19 19:30:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated build script

Browse Source
This commit is contained in:
Alexey Pustovalov 2021-10-09 00:00:45 +02:00
parent d49dc149d5
commit 3a6fecf3bc
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/images_build_windows.yml vendored
View File

@ -120,7 +120,7 @@ jobs:
path: ${{ env.BASE_BUILD_NAME }}_${{ matrix.os }}_${{ matrix.build }} path: ${{ env.BASE_BUILD_NAME }}_${{ matrix.os }}_${{ matrix.build }}
if-no-files-found: error if-no-files-found: error
build_base_database: build_components:
timeout-minutes: 70 timeout-minutes: 70
needs: [ "build_base", "init_build"] needs: [ "build_base", "init_build"]
name: Build ${{ matrix.build }} sources on ${{ matrix.os }} name: Build ${{ matrix.build }} sources on ${{ matrix.os }}
@ -188,13 +188,13 @@ jobs:
- name: Upload SHA256 tag - name: Upload SHA256 tag
uses: actions/upload-artifact@v2.2.4 uses: actions/upload-artifact@v2.2.4
with: with:
name: base-mysql_${{ matrix.os }}_${{ matrix.build }}) name: base-mysql_${{ matrix.os }}_${{ matrix.build }}
path: base-mysql_${{ matrix.os }}_${{ matrix.build }}) path: base-mysql_${{ matrix.os }}_${{ matrix.build }}
if-no-files-found: error if-no-files-found: error
build_images: build_images:
timeout-minutes: 70 timeout-minutes: 70
needs: [ "build_base_database", "init_build"] needs: [ "build_components", "init_build"]
name: Build ${{ matrix.build }} on ${{ matrix.os }} name: Build ${{ matrix.build }} on ${{ matrix.os }}
strategy: strategy:
fail-fast: false fail-fast: false
@ -217,12 +217,12 @@ jobs:
flavor: | flavor: |
latest=false latest=false
- name: Download SHA256 tag for ${{ steps.build_base_image.outputs.build_base }}:${{ matrix.os }} - name: Download SHA256 tag for build-components:${{ matrix.os }}
uses: actions/download-artifact@v2.0.10 uses: actions/download-artifact@v2.0.10
with: with:
name: base-mysql_${{ matrix.os }}_${{ matrix.build }} name: base-mysql_${{ matrix.os }}_${{ matrix.build }}
- name: Retrieve ${{ steps.build_base_image.outputs.build_base }}:${{ matrix.os }} SHA256 tag - name: Retrieve build-components:${{ matrix.os }} SHA256 tag
id: base_build id: base_build
run: | run: |
$base_tag=$(cat base-mysql_${{ matrix.os }}_${{ matrix.build }} ) $base_tag=$(cat base-mysql_${{ matrix.os }}_${{ matrix.build }} )

2
Dockerfiles/build-mysql/windows/Dockerfile.agent
View File

@ -52,7 +52,7 @@ RUN Set-Location -Path $env:SystemDrive\.; `
MODBLIBDIR=$env:SystemDrive\libmodbus\src\win32\$env:BUILD_ARCH\Release ` MODBLIBDIR=$env:SystemDrive\libmodbus\src\win32\$env:BUILD_ARCH\Release `
$env:ZBX_COMPONENT; ` $env:ZBX_COMPONENT; `
` `
Write-Host 'Verifying build ("zabbix_agent2.exe -V") ...'; ` Write-Host 'Verifying build ("zabbix_agentd.exe -V") ...'; `
& $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_agentd.exe -V; ` & $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_agentd.exe -V; `
dumpbin /dependents $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_agentd.exe; ` dumpbin /dependents $env:SystemDrive\zabbix-$env:ZBX_VERSION\bin\win64\zabbix_agentd.exe; `
` `