Skip to content

Commit 80c54e2

Browse files
authored
Merge branch 'master' into dependabot/gradle/lib/kotlin/com.ncorti.ktfmt.gradle-0.21.0
2 parents c53be12 + 951bb18 commit 80c54e2

File tree

90 files changed

+576
-403
lines changed

Some content is hidden

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

90 files changed

+576
-403
lines changed

.github/workflows/build.yml

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ jobs:
135135
strategy:
136136
matrix:
137137
go:
138-
- '1.22'
139138
- '1.23'
139+
- '1.24'
140140
fail-fast: false
141141
steps:
142142
- uses: actions/checkout@v4
@@ -180,7 +180,7 @@ jobs:
180180
run: make -C test/go precross
181181

182182
- name: Upload go precross artifacts
183-
if: matrix.go == '1.23'
183+
if: matrix.go == '1.24'
184184
uses: actions/upload-artifact@v4
185185
with:
186186
name: go-precross
@@ -315,6 +315,7 @@ jobs:
315315
# caveat: net9 is (currently?) NOT installed, so manually again
316316
- name: Set up .NET SDK
317317
run: |
318+
sudo add-apt-repository ppa:dotnet/backports
318319
sudo apt-get install -y --no-install-recommends dotnet-sdk-9.0
319320
# end
320321

@@ -400,7 +401,7 @@ jobs:
400401
needs: compiler
401402
runs-on: ubuntu-24.04
402403
env:
403-
TOOLCHAIN_VERSION: 1.65.0
404+
TOOLCHAIN_VERSION: 1.83.0
404405
steps:
405406
- uses: actions/checkout@v4
406407

@@ -519,6 +520,35 @@ jobs:
519520
- name: Run make check for python
520521
run: make -C lib/py check
521522

523+
lib-nodejs:
524+
needs: compiler
525+
runs-on: ubuntu-24.04
526+
steps:
527+
- uses: actions/checkout@v4
528+
529+
- name: Run bootstrap
530+
run: ./bootstrap.sh
531+
532+
- name: Run configure
533+
run: |
534+
./configure $(echo $CONFIG_ARGS_FOR_LIBS | sed -E 's/without-node([tj])s/with-node\1s/g')
535+
536+
- uses: actions/download-artifact@v4
537+
with:
538+
name: thrift-compiler
539+
path: compiler/cpp
540+
541+
- name: Run thrift-compiler
542+
run: |
543+
chmod a+x compiler/cpp/thrift
544+
compiler/cpp/thrift -version
545+
546+
- name: Run js tests
547+
run: make -C lib/nodejs check
548+
549+
- name: Run ts tests
550+
run: make -C lib/nodets check
551+
522552
cross-test:
523553
needs:
524554
- lib-java-kotlin

LANGUAGES.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ Thrift's core protocol is TBinary, supported by all languages except for JavaScr
163163
<td align=left><a href="https://github.com/apache/thrift/blob/master/lib/go/README.md">Go</a></td>
164164
<!-- Since -----------------><td>0.7.0</td>
165165
<!-- Build Systems ---------><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cred.png" alt=""/></td>
166-
<!-- Language Levels -------><td>1.22</td><td>1.23</td>
166+
<!-- Language Levels -------><td>1.23</td><td>1.24</td>
167167
<!-- Field types -----------><td><img src="/doc/images/cgrn.png" alt="Yes"/></td>
168168
<!-- Low-Level Transports --><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cred.png" alt=""/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cred.png" alt=""/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td>
169169
<!-- Transport Wrappers ----><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td>
@@ -319,7 +319,7 @@ Thrift's core protocol is TBinary, supported by all languages except for JavaScr
319319
<td align=left><a href="https://github.com/apache/thrift/blob/master/lib/rs/README.md">Rust</a></td>
320320
<!-- Since -----------------><td>0.11.0</td>
321321
<!-- Build Systems ---------><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cred.png" alt=""/></td>
322-
<!-- Language Levels -------><td>1.65.0</td><td>1.xx.x</td>
322+
<!-- Language Levels -------><td>1.83.0</td><td>1.xx.x</td>
323323
<!-- Field types -----------><td><img src="/doc/images/cred.png" alt=""/></td>
324324
<!-- Low-Level Transports --><td><img src="/doc/images/cred.png" alt=""/></td><td><img src="/doc/images/cred.png" alt=""/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cred.png" alt=""/></td><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cred.png" alt=""/></td>
325325
<!-- Transport Wrappers ----><td><img src="/doc/images/cgrn.png" alt="Yes"/></td><td><img src="/doc/images/cred.png" alt=""/></td><td><img src="/doc/images/cred.png" alt=""/></td><td><img src="/doc/images/cred.png" alt=""/></td>

build/cmake/GenerateConfigModule.cmake

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,16 @@
1818
#
1919

2020
include(CMakePackageConfigHelpers)
21-
set(PACKAGE_INCLUDE_INSTALL_DIR "${includedir}/thrift")
22-
set(PACKAGE_CMAKE_INSTALL_DIR "${cmakedir}/thrift")
23-
set(PACKAGE_BIN_INSTALL_DIR "${exec_prefix}")
2421

25-
# In CYGWIN enviroment below commands does not work properly
22+
# In CYGWIN environment below commands does not work properly
2623
if (NOT CYGWIN)
2724
configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/ThriftConfig.cmake.in"
2825
"${CMAKE_CURRENT_BINARY_DIR}/ThriftConfig.cmake"
2926
INSTALL_DESTINATION "${CMAKE_INSTALL_DIR}/thrift"
3027
PATH_VARS
31-
PACKAGE_INCLUDE_INSTALL_DIR
32-
PACKAGE_CMAKE_INSTALL_DIR
33-
PACKAGE_BIN_INSTALL_DIR
28+
INCLUDE_INSTALL_DIR
29+
CMAKE_INSTALL_DIR
30+
BIN_INSTALL_DIR
3431
)
3532

3633
write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/ThriftConfigVersion.cmake"

build/cmake/ThriftConfig.cmake.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ set(THRIFT_VERSION @thrift_VERSION@)
2121

2222
@PACKAGE_INIT@
2323

24-
set_and_check(THRIFT_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
25-
set_and_check(THRIFT_CMAKE_DIR "@PACKAGE_CMAKE_INSTALL_DIR@")
24+
set_and_check(THRIFT_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}")
25+
26+
set_and_check(THRIFT_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@/thrift")
2627
set_and_check(THRIFT_BIN_DIR "@PACKAGE_BIN_INSTALL_DIR@")
2728
if(NOT DEFINED THRIFT_COMPILER)
2829
set(THRIFT_COMPILER "${THRIFT_BIN_DIR}/thrift@CMAKE_EXECUTABLE_SUFFIX@")

build/docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,6 @@ Last updated: March 5, 2024
196196
| python2 | 2.7.18 | | |
197197
| python3 | 3.8.10 | 3.10.12 | |
198198
| ruby | 2.7.0p0 | 3.0.2p107 | |
199-
| rust | 1.65.0 | 1.65.0 | |
199+
| rust | 1.83.0 | 1.83.0 | |
200200
| smalltalk | | | Not in CI |
201201
| swift | 5.7 | 5.7 | |

build/docker/ubuntu-focal/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,10 @@ ENV PATH /usr/lib/dart/bin:$PATH
139139

140140
RUN apt-get install -y --no-install-recommends \
141141
`# dotnet core dependencies` \
142-
dotnet-sdk-9.0 \
143-
dotnet-runtime-9.0 \
144-
aspnetcore-runtime-9.0 \
145-
dotnet-apphost-pack-9.0
142+
dotnet-sdk-8.0 \
143+
dotnet-runtime-8.0 \
144+
aspnetcore-runtime-8.0 \
145+
dotnet-apphost-pack-8.0
146146

147147
# Erlang dependencies
148148
ARG ERLANG_OTP_VERSION=23.3.4.11
@@ -273,7 +273,7 @@ RUN apt-get install -y --no-install-recommends \
273273

274274
USER ${user}
275275
RUN `# Rust dependencies` \
276-
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.65.0 -y
276+
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.83.0 -y
277277
ENV PATH /home/${user}/.cargo/bin:$PATH
278278
USER root
279279

build/docker/ubuntu-jammy/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ RUN apt-get install -y --no-install-recommends \
136136
dart=$DART_VERSION
137137
ENV PATH /usr/lib/dart/bin:$PATH
138138

139+
RUN add-apt-repository ppa:dotnet/backports
139140
RUN apt-get install -y --no-install-recommends \
140141
`# dotnet core dependencies` \
141142
dotnet-sdk-9.0 \
@@ -272,7 +273,7 @@ RUN apt-get install -y --no-install-recommends \
272273

273274
USER ${user}
274275
RUN `# Rust dependencies` \
275-
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.65.0 -y
276+
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.83.0 -y
276277
ENV PATH /home/${user}/.cargo/bin:$PATH
277278
USER root
278279

0 commit comments

Comments
 (0)