Skip to content

Commit 2a1d755

Browse files
authored
Merge branch 'master' into alter_constraint
2 parents e3bb525 + 663d8fc commit 2a1d755

File tree

380 files changed

+12646
-6279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

380 files changed

+12646
-6279
lines changed

.github/workflows/increment-build-number.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
with:
1616
token: ${{ secrets.FIREBIRD_INC_BUILDNUM }}
1717
persist-credentials: true

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ jobs:
312312

313313
- name: Prepare - Install tools
314314
run: |
315-
brew install automake autoconf-archive cmake libtool ninja
315+
brew install automake autoconf-archive libtool ninja
316316
317317
- name: Export GitHub Actions cache environment variables
318318
uses: actions/github-script@v7

.github/workflows/qa.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ jobs:
1515

1616
steps:
1717
- name: Checkout firebird-qa
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
with:
2020
fetch-depth: 1
2121
repository: FirebirdSQL/firebird-qa
2222
path: firebird-qa
2323

2424
- name: Download firebird installer
2525
id: download-artifact
26-
uses: dawidd6/action-download-artifact@v2
26+
uses: dawidd6/action-download-artifact@v6
2727
with:
2828
github_token: ${{secrets.GITHUB_TOKEN}}
2929
workflow: main.yml

.github/workflows/trim-trailing-spaces.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- v4.0-release
1818

1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
with:
2222
ref: ${{ matrix.branch }}
2323
persist-credentials: false

.github/workflows/tzdata-update.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: tzdata-update
22

33
on:
4+
workflow_dispatch:
45
schedule:
56
- cron: '0 11 * * *'
67

@@ -22,12 +23,14 @@ jobs:
2223
with:
2324
ref: ${{ matrix.branch }}
2425

25-
- name: Checkout ICU
26-
run: GIT_CLONE_PROTECTION_ACTIVE=false git clone --depth 1 https://github.com/unicode-org/icu-data.git -b main /tmp/icu-checkout
26+
- name: Download ICU
27+
run: |
28+
wget --no-verbose -O /tmp/icu.zip https://github.com/unicode-org/icu-data/archive/refs/heads/main.zip
29+
unzip -d /tmp /tmp/icu.zip
2730
2831
- name: Check and update
2932
run: |
30-
VERSION=`ls /tmp/icu-checkout/tzdata/icunew/ -r1a |head -1`
33+
VERSION=`ls /tmp/icu-data-main/tzdata/icunew/ -r1a |head -1`
3134
echo Last version: $VERSION
3235
3336
if [ "$VERSION" == "`cat extern/icu/tzdata/version.txt`" ]

builds/install/arch-specific/aix/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
# As a special exception this file can also be included in modules
99
# with other source code as long as that source code has been
10-
# released under an Open Source Initiative certificed licence.
10+
# released under an Open Source Initiative certified licence.
1111
# More information about OSI certification can be found at:
1212
# http://www.opensource.org
1313
#

builds/install/arch-specific/aix/classic/makeInstallImage.sh.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
# As a special exception this file can also be included in modules
1212
# with other source code as long as that source code has been
13-
# released under an Open Source Initiative certificed licence.
13+
# released under an Open Source Initiative certified licence.
1414
# More information about OSI certification can be found at:
1515
# http://www.opensource.org
1616
#
@@ -92,10 +92,10 @@ copyIfExists() {
9292
#------------------------------------------------------------------------
9393
# copyFiles
9494
# This function copies all the files for a classic distribution into a
95-
# directory heirachy mirroring the installation.
95+
# directory hierarchy mirroring the installation.
9696

9797
copyFiles() {
98-
# The guts of the tranfer of files and other directories
98+
# The guts of the transfer of files and other directories
9999

100100
if [ -d $TargetDir ]
101101
then

builds/install/arch-specific/aix/misc/postuninstall.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#
1212
# As a special exception this file can also be included in modules
1313
# with other source code as long as that source code has been
14-
# released under an Open Source Initiative certificed licence.
14+
# released under an Open Source Initiative certified licence.
1515
# More information about OSI certification can be found at:
1616
# http://www.opensource.org
1717
#

builds/install/arch-specific/aix/misc/preinstall.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#
1212
# As a special exception this file can also be included in modules
1313
# with other source code as long as that source code has been
14-
# released under an Open Source Initiative certificed licence.
14+
# released under an Open Source Initiative certified licence.
1515
# More information about OSI certification can be found at:
1616
# http://www.opensource.org
1717
#

builds/install/arch-specific/aix/misc/preuninstall.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#
1212
# As a special exception this file can also be included in modules
1313
# with other source code as long as that source code has been
14-
# released under an Open Source Initiative certificed licence.
14+
# released under an Open Source Initiative certified licence.
1515
# More information about OSI certification can be found at:
1616
# http://www.opensource.org
1717
#

0 commit comments

Comments
 (0)