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
23 changes: 13 additions & 10 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: Linux

on:
push:
branches: [ "master", "new-build-system", "new-build-system-no-pr" ]
pull_request:
branches: [ "master" ]

permissions:
Expand All @@ -18,16 +20,17 @@ jobs:
- name: Install UnixODBC package
run: sudo apt-get install -y unixodbc unixodbc-dev

- name: Go to build folder & make
working-directory: ${{env.GITHUB_WORKSPACE}}
run: |
cd Builds/Gcc.lin
cp makefile.linux makefile
make

- name: Configure CMake
run: cmake -B build -DCMAKE_BUILD_TYPE=Release

- name: Build
run: cmake --build build --config Release

- name: Run tests (no database — all tests skip)
run: ctest --test-dir build --output-on-failure

- uses: actions/upload-artifact@v4
with:
name: linux_libs
name: linux_x64_libs
path: |
./Builds/Gcc.lin/Release_*
!./Builds/Gcc.lin/Release_*/obj
./build/libOdbcFb.so
6 changes: 6 additions & 0 deletions .github/workflows/msbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ name: MSBuild

on:
push:
branches: [ "master", "new-build-system", "new-build-system-no-pr" ]
pull_request:
branches: [ "master" ]

env:
Expand Down Expand Up @@ -43,6 +45,10 @@ jobs:
working-directory: ${{env.GITHUB_WORKSPACE}}
run: nuget restore ${{env.SOLUTION_FILE_PATH}}

- name: Fetch Firebird headers (required by .vcxproj include paths)
working-directory: ${{env.GITHUB_WORKSPACE}}
run: cmake -B build -DBUILD_TESTING=OFF

- name: Stub
working-directory: ${{env.GITHUB_WORKSPACE}}
run: |
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/rpi_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: RaspberryPI

on:
push:
branches: [ "master", "new-build-system", "new-build-system-no-pr" ]
pull_request:
branches: [ "master" ]

permissions:
Expand All @@ -19,17 +21,17 @@ jobs:
base_image: raspios_lite_arm64:latest
copy_repository_path: /opt/fb_odbc
copy_artifact_path: |
Builds/Gcc.lin/Release_*
build/libOdbcFb.so
commands: |
sudo apt-get install -y unixodbc unixodbc-dev
cd /opt/fb_odbc/Builds/Gcc.lin
cp makefile.linux makefile
make
sudo apt-get update
sudo apt-get install -y cmake unixodbc unixodbc-dev
cd /opt/fb_odbc
cmake -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF
cmake --build build --config Release

- uses: actions/upload-artifact@v4
with:
name: linux_arm64_libs
path: |
Release_*
!Release_*/obj
libOdbcFb.so

30 changes: 30 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,33 @@ Install/Win32/install_image/
build_*.log
OdbcJdbcSetup_*.iss
.vs/*

# CMake
build/
build-*/
Build/
out/
cmake-build-*/
CMakeCache.txt
CMakeFiles/
cmake_install.cmake
CTestTestfile.cmake
_deps/
install_manifest.txt
Testing/
tests/Testing/

# Build artifacts
*.o
*.obj
*.dll
*.lib
*.exe
*.pdb
*.ilk
*.exp

# IDE
.idea/
.vscode/
CMakeUserPresets.json
109 changes: 0 additions & 109 deletions Builds/Bcc55.win/HowToCompileGuide-BCC55.txt

This file was deleted.

15 changes: 0 additions & 15 deletions Builds/Bcc55.win/build.bat

This file was deleted.

1 change: 0 additions & 1 deletion Builds/Bcc55.win/build98.bat

This file was deleted.

1 change: 0 additions & 1 deletion Builds/Bcc55.win/buildNT.bat

This file was deleted.

102 changes: 0 additions & 102 deletions Builds/Bcc55.win/makefile.bcc55

This file was deleted.

Loading
Loading