Skip to content

Commit

Permalink
Pipeline fix
Browse files Browse the repository at this point in the history
Firebird v5 added on matrix tests. Windows build fixed. Mac build
fixed. Security run disabled when push on master.
  • Loading branch information
fernandobatels committed Aug 28, 2024
1 parent 3dcdc94 commit 942c955
Showing 1 changed file with 17 additions and 5 deletions.
22 changes: 17 additions & 5 deletions .github/workflows/testing_changes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,17 +87,25 @@ jobs:
fail-fast: false
matrix:
os: ["ubuntu-20.04", "windows-latest", "macos-latest"]
firebird: [v3, v2, v4]
firebird: [v3, v2, v4, v5]
build: [linking, dynamic_loading, pure_rust]
exclude:
- os: "windows-latest"
firebird: v2
- os: "windows-latest"
firebird: v3
- os: "windows-latest"
firebird: v4
- os: "macos-latest"
firebird: v2
- os: "macos-latest"
firebird: v4
- os: "macos-latest"
firebird: v5
- os: "ubuntu-20.04"
firebird: v5
- os: "macos-latest"
features: dynamic_loading
include:
- os: "ubuntu-20.04"
plataform: linux
Expand All @@ -111,6 +119,8 @@ jobs:
image: "3.0"
- firebird: v4
image: "4.0"
- firebird: v5
image: "5.0"
- build: linking
features: linking
features_diesel: linking
Expand Down Expand Up @@ -143,6 +153,7 @@ jobs:
run: |
wget https://github.com/FirebirdSQL/firebird/releases/download/R3_0_6/Firebird-3.0.6-33328-x86_64.pkg -O /tmp/firebird.pkg
sudo installer -verbose -pkg /tmp/firebird.pkg -target /
sudo mkdir -p /usr/local/lib
sudo ln -s /Library/Frameworks/Firebird.framework/Versions/A/Libraries/libfbclient.dylib /usr/local/lib/libfbclient.dylib
- name: Locating fbclient.lib Dir on Windows
Expand All @@ -155,7 +166,7 @@ jobs:
)
$WinSysDir = [Environment]::SystemDirectory
$CommonDirs = @(
"C:\Program Files\Firebird",
"C:\Program Files\Firebird",
"C:\Firebird",
"${WinSysDir}"
)
Expand Down Expand Up @@ -198,7 +209,7 @@ jobs:
- name: Create database test.fdb in fb ${{ matrix.firebird }} on Windows
if: matrix.plataform == 'windows'
run: |
echo "CREATE DATABASE 'localhost:test.fdb';" | & "C:\Program Files\Firebird\Firebird_4_0\isql.exe" -bail -quiet -z -user SYSDBA -password masterkey
echo "CREATE DATABASE 'localhost:test.fdb';" | & "C:\Program Files\Firebird\Firebird_5_0\isql.exe" -bail -quiet -z -user SYSDBA -password masterkey
- name: Create database test.fdb in fb ${{ matrix.firebird }} on MacOSX
if: matrix.plataform == 'macos'
Expand All @@ -208,13 +219,13 @@ jobs:
- name: Testing Connection and Query on Linux
if: matrix.firebird != 'v4' && matrix.plataform == 'linux'
run: |
SQL1='select RDB$CHARACTER_SET_NAME as charset_sysdba from rdb$database;'
SQL1='select RDB$CHARACTER_SET_NAME as charset_sysdba from rdb$database;'
echo $SQL1 | isql-fb -bail -quiet -z -user SYSDBA -password masterkey 'localhost:/firebird/data/test.fdb'
- name: Testing Connection for User test_user on fb v3
if: matrix.firebird == 'v3' && matrix.plataform == 'linux'
run: |
SQL2='select RDB$CHARACTER_SET_NAME as charset_user from rdb$database;'
SQL2='select RDB$CHARACTER_SET_NAME as charset_user from rdb$database;'
echo $SQL2 | isql-fb -bail -quiet -z -user test_user -password test_password 'localhost:test.fdb'
- name: Run cargo build
Expand Down Expand Up @@ -365,6 +376,7 @@ jobs:

security:
name: security
if: github.ref != 'refs/heads/master'
needs: linting
runs-on: ubuntu-latest
steps:
Expand Down

0 comments on commit 942c955

Please sign in to comment.