Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ jobs:
builds/install_images/Firebird-*-windows-arm64*.zip

build-windows-docker:
runs-on: windows-2022
runs-on: windows-2025

strategy:
fail-fast: false
Expand All @@ -300,14 +300,41 @@ jobs:
- name: Get Release Notes
uses: ./.github/actions/get-release-notes

# firebirdsql/firebird-builder-windows image is private
- name: Login to Docker Hub
id: dockerhub-login
uses: docker/login-action@v3
continue-on-error: true
with:
username: firebirdsql
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Docker pull firebirdsql/firebird-builder-windows
shell: cmd
if: ${{ steps.dockerhub-login.outcome == 'success' }}
run: |
docker pull firebirdsql/firebird-builder-windows:fb6-x86-x64-windows-v1

- name: Reclaim disk space in the runner to build the image
if: ${{ runner.environment == 'github-hosted' && steps.dockerhub-login.outcome != 'success' }}
shell: cmd
run: |
rd "C:\Program Files\Microsoft Visual Studio\2022" /s /q

- name: Build firebird-builder-windows image (fallback)
shell: cmd
if: ${{ steps.dockerhub-login.outcome != 'success' }}
run: |
cd builds\docker\windows
call build.bat

- name: Build x86 for client package in x64
id: build-x86
shell: cmd
if: ${{ matrix.platform == 'x64' }}
run: |
mkdir builds\install_images
cd builds\docker\windows
call build.bat
call run.bat C:\fbscripts\build-x86.bat

- name: Build
Expand All @@ -318,7 +345,6 @@ jobs:
run: |
mkdir builds\install_images
cd builds\docker\windows
call build.bat
call run.bat C:\fbscripts\build-%PLATFORM%.bat

- name: Upload zip
Expand Down
2 changes: 1 addition & 1 deletion builds/docker/windows/build.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@echo off
docker build -t asfernandes/firebird-builder:5 -m 2GB .
docker build -t firebirdsql/firebird-builder-windows:fb6-x86-x64-windows-v1 -m 2GB .
2 changes: 2 additions & 0 deletions builds/docker/windows/push.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
docker push firebirdsql/firebird-builder-windows:fb6-x86-x64-windows-v1
2 changes: 1 addition & 1 deletion builds/docker/windows/run.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@echo off
docker run --rm -v %cd%\..\..\..:C:\firebird asfernandes/firebird-builder:5 %1
docker run --rm -v %cd%\..\..\..:C:\firebird firebirdsql/firebird-builder-windows:fb6-x86-x64-windows-v1 %1
Loading