Skip to content

Commit 7ea4a96

Browse files
pjreinigerpjreiniger
committed
Update to 2027 release
1 parent b1f77dc commit 7ea4a96

17 files changed

Lines changed: 444 additions & 562 deletions

File tree

‎.bazelversion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.2.1
1+
8.3.1

‎.github/workflows/build.yml‎

Lines changed: 13 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414
# Build non-bzlmod, native
1515
- { name: "windows - native", os: windows-2022, java_arch: "x64", command: "test", config: "--noenable_bzlmod --enable_workspace --config=windows", bazel_options: "--output_user_root=C:\\bazelroot", }
1616
- { name: "windows arm - native", os: windows-11-arm, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=windows_arm", bazel_options: "--output_user_root=C:\\bazelroot", }
17-
- { name: "ubuntu - native", os: ubuntu-22.04, java_arch: "x64", command: "test", config: "--noenable_bzlmod --enable_workspace --config=linux", bazel_options: "", }
17+
- { name: "ubuntu - native", os: ubuntu-24.04, java_arch: "x64", command: "test", config: "--noenable_bzlmod --enable_workspace --config=linux", bazel_options: "", }
1818
- { name: "macos - native", os: macos-14, java_arch: "aarch64", command: "test", config: "--noenable_bzlmod --enable_workspace --config=macos", bazel_options: "", }
1919

2020
# Build bzlmod, native
2121
- { name: "windows - bzlmod native", os: windows-2022, java_arch: "x64", command: "test", config: "--enable_bzlmod --config=windows", bazel_options: "--output_user_root=C:\\bazelroot", }
2222
- { name: "windows arm - bzlmod native", os: windows-11-arm, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=windows_arm", bazel_options: "--output_user_root=C:\\bazelroot", }
23-
- { name: "ubuntu - bzlmod native", os: ubuntu-22.04, java_arch: "x64", command: "test", config: "--enable_bzlmod --config=linux", bazel_options: "", }
23+
- { name: "ubuntu - bzlmod native", os: ubuntu-24.04, java_arch: "x64", command: "test", config: "--enable_bzlmod --config=linux", bazel_options: "", }
2424
- { name: "macos - bzlmod native", os: macos-14, java_arch: "aarch64", command: "test", config: "--enable_bzlmod --config=macos", bazel_options: "", }
2525

2626
name: "Build - ${{ matrix.name }}"
@@ -47,57 +47,20 @@ jobs:
4747
run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci
4848
working-directory: tests
4949

50-
51-
build_roborio:
52-
strategy:
53-
fail-fast: false
54-
matrix:
55-
include:
56-
# Build non-bzlmod, roborio
57-
- { name: "windows - roborio", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=roborio", bazel_options: "--output_user_root=C:\\bazelroot", }
58-
- { name: "ubuntu - roborio", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=roborio", bazel_options: "", }
59-
- { name: "macos - roborio", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=roborio", bazel_options: "", }
60-
61-
# Build bzlmod, roborio
62-
# - { name: "windows - bzlmod roborio", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=roborio", bazel_options: "--output_user_root=C:\\bazelroot", }
63-
- { name: "ubuntu - bzlmod roborio", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=roborio", bazel_options: "", }
64-
- { name: "macos - bzlmod roborio", os: macos-14, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=roborio", bazel_options: "", }
65-
name: "Build - ${{ matrix.name }}"
66-
runs-on: ${{ matrix.os }}
67-
steps:
68-
- uses: actions/checkout@v4
69-
- uses: actions/setup-python@v5
70-
with: { python-version: '3.11' }
71-
- uses: actions/setup-java@v4
72-
with:
73-
distribution: 'zulu'
74-
java-version: 17
75-
architecture: ${{ matrix.java_arch }}
76-
- id: setup_build_buddy
77-
uses: ./.github/actions/setup-build-buddy
78-
with:
79-
token: ${{ secrets.BUILDBUDDY_API_KEY }}
80-
- name: Build and allow failure # TODO Sometimes symlinks don't get created correctly the first time around
81-
run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci || true
82-
working-directory: tests
83-
- name: Build
84-
run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci
85-
working-directory: tests
86-
87-
build_linuxarm32:
50+
build_systemcore:
8851
strategy:
8952
fail-fast: false
9053
matrix:
9154
include:
92-
# Build non-bzlmod, linuxarm32
93-
- { name: "windows - linuxarm32", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=linuxarm32", bazel_options: "--output_user_root=C:\\bazelroot", }
94-
- { name: "ubuntu - linuxarm32", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=linuxarm32", bazel_options: "", }
95-
- { name: "macos - linuxarm32", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=linuxarm32", bazel_options: "", }
55+
# Build non-bzlmod, systemcore
56+
- { name: "windows - systemcore", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=systemcore", bazel_options: "--output_user_root=C:\\bazelroot", }
57+
- { name: "ubuntu - systemcore", os: ubuntu-24.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=systemcore", bazel_options: "", }
58+
- { name: "macos - systemcore", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=systemcore", bazel_options: "", }
9659

97-
# Build bzlmod, linuxarm32
98-
# - { name: "windows - bzlmod linuxarm32", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=linuxarm32", bazel_options: "--output_user_root=C:\\bazelroot", }
99-
- { name: "ubuntu - bzlmod linuxarm32", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=linuxarm32", bazel_options: "", }
100-
- { name: "macos - bzlmod linuxarm32", os: macos-14, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=linuxarm32", bazel_options: "", }
60+
# Build bzlmod, systemcore
61+
- { name: "windows - bzlmod systemcore", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=systemcore", bazel_options: "--output_user_root=C:\\bazelroot", }
62+
- { name: "ubuntu - bzlmod systemcore", os: ubuntu-24.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=systemcore", bazel_options: "", }
63+
- { name: "macos - bzlmod systemcore", os: macos-14, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=systemcore", bazel_options: "", }
10164
name: "Build - ${{ matrix.name }}"
10265
runs-on: ${{ matrix.os }}
10366
steps:
@@ -127,12 +90,12 @@ jobs:
12790
include:
12891
# Build non-bzlmod, linuxarm64
12992
- { name: "windows - linuxarm64", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=linuxarm64", bazel_options: "--output_user_root=C:\\bazelroot", }
130-
- { name: "ubuntu - linuxarm64", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=linuxarm64", bazel_options: "", }
93+
- { name: "ubuntu - linuxarm64", os: ubuntu-24.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=linuxarm64", bazel_options: "", }
13194
- { name: "macos - linuxarm64", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=linuxarm64", bazel_options: "", }
13295

13396
# Build bzlmod, linuxarm64
13497
- { name: "windows - bzlmod linuxarm64", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=linuxarm64", bazel_options: "--output_user_root=C:\\bazelroot", }
135-
- { name: "ubuntu - bzlmod linuxarm64", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=linuxarm64", bazel_options: "", }
98+
- { name: "ubuntu - bzlmod linuxarm64", os: ubuntu-24.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=linuxarm64", bazel_options: "", }
13699
- { name: "macos - bzlmod linuxarm64", os: macos-14, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=linuxarm64", bazel_options: "", }
137100
name: "Build - ${{ matrix.name }}"
138101
runs-on: ${{ matrix.os }}

‎.github/workflows/lint.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
name: "buildifier"
1313
runs-on: ubuntu-22.04
1414
steps:
15-
- name: Set up Go 1.20.x
16-
uses: actions/setup-go@v5
15+
- name: Set up Go
16+
uses: actions/setup-go@v6
1717
with:
18-
go-version: 1.20.x
18+
go-version: "1.25"
1919
cache: false
2020
id: go
2121

‎.github/workflows/publish.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,15 @@ jobs:
2626
- name: Setup archive name
2727
run: echo "ARCHIVE_NAME=libraries/bzlmodrio-libssh/bzlmodrio-libssh-${GITHUB_REF_NAME}.tar.gz" >> "$GITHUB_ENV"
2828

29+
- name: Pre Release
30+
uses: softprops/action-gh-release@v2
31+
if: startsWith(github.ref, 'refs/tags/') && (contains(github.ref, 'alpha') || contains(github.ref, 'beta'))
32+
with:
33+
files: "${{ env.ARCHIVE_NAME }}"
34+
prerelease: True
35+
2936
- name: Release
3037
uses: softprops/action-gh-release@v2
31-
if: startsWith(github.ref, 'refs/tags/')
38+
if: startsWith(github.ref, 'refs/tags/') && !(contains(github.ref, 'alpha') || contains(github.ref, 'beta'))
3239
with:
3340
files: "${{ env.ARCHIVE_NAME }}"

.styleguide renamed to .wpiformat

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ cppSrcFileInclude {
1313
\.cpp$
1414
}
1515

16-
modifiableFileExclude {
17-
}
18-
1916
generatedFileExclude {
2017
bazel-bin/
2118
bazel-out/
@@ -25,9 +22,3 @@ generatedFileExclude {
2522
\.jinja2$
2623
generate/vendor_dep.json$
2724
}
28-
29-
repoRootNameOverride {
30-
}
31-
32-
includeOtherLibs {
33-
}

.styleguide-license renamed to .wpiformat-license

File renamed without changes.

‎MODULE.bazel‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
11
module(
22
name = "bzlmodrio-libssh",
3-
version = "2024.0.105-1.bcr1",
4-
compatibility_level = 2024,
3+
version = "2027-0.120-1",
4+
compatibility_level = 2027,
55
)
66

7-
bazel_dep(name = "platforms", version = "0.0.9")
8-
bazel_dep(name = "rules_cc", version = "0.1.1")
9-
bazel_dep(name = "rules_java", version = "8.11.0")
10-
bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1.bcr4")
7+
bazel_dep(name = "platforms", version = "0.0.11")
8+
bazel_dep(name = "rules_cc", version = "0.1.4")
9+
bazel_dep(name = "rules_java", version = "8.12.0")
10+
bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1.bcr7")
1111

1212
setup_bzlmodrio_libssh_cpp_dependencies = use_extension("//:maven_cpp_deps.bzl", "setup_bzlmodrio_libssh_cpp_dependencies")
1313
use_repo(
1414
setup_bzlmodrio_libssh_cpp_dependencies,
15-
"bazelrio_edu_wpi_first_thirdparty_frc_libssh_headers",
16-
"bazelrio_edu_wpi_first_thirdparty_frc_libssh_linuxarm32static",
17-
"bazelrio_edu_wpi_first_thirdparty_frc_libssh_linuxarm32staticdebug",
18-
"bazelrio_edu_wpi_first_thirdparty_frc_libssh_linuxarm64static",
19-
"bazelrio_edu_wpi_first_thirdparty_frc_libssh_linuxarm64staticdebug",
20-
"bazelrio_edu_wpi_first_thirdparty_frc_libssh_linuxx86-64static",
21-
"bazelrio_edu_wpi_first_thirdparty_frc_libssh_linuxx86-64staticdebug",
22-
"bazelrio_edu_wpi_first_thirdparty_frc_libssh_osxuniversalstatic",
23-
"bazelrio_edu_wpi_first_thirdparty_frc_libssh_osxuniversalstaticdebug",
24-
"bazelrio_edu_wpi_first_thirdparty_frc_libssh_sources",
25-
"bazelrio_edu_wpi_first_thirdparty_frc_libssh_windowsarm64static",
26-
"bazelrio_edu_wpi_first_thirdparty_frc_libssh_windowsarm64staticdebug",
27-
"bazelrio_edu_wpi_first_thirdparty_frc_libssh_windowsx86-64static",
28-
"bazelrio_edu_wpi_first_thirdparty_frc_libssh_windowsx86-64staticdebug",
29-
"bazelrio_edu_wpi_first_thirdparty_frc_libssh_windowsx86static",
30-
"bazelrio_edu_wpi_first_thirdparty_frc_libssh_windowsx86staticdebug",
15+
"bazelrio_org_wpilib_thirdparty_libssh_headers",
16+
"bazelrio_org_wpilib_thirdparty_libssh_linuxarm64static",
17+
"bazelrio_org_wpilib_thirdparty_libssh_linuxarm64staticdebug",
18+
"bazelrio_org_wpilib_thirdparty_libssh_linuxx86-64static",
19+
"bazelrio_org_wpilib_thirdparty_libssh_linuxx86-64staticdebug",
20+
"bazelrio_org_wpilib_thirdparty_libssh_osxuniversalstatic",
21+
"bazelrio_org_wpilib_thirdparty_libssh_osxuniversalstaticdebug",
22+
"bazelrio_org_wpilib_thirdparty_libssh_sources",
23+
"bazelrio_org_wpilib_thirdparty_libssh_windowsarm64static",
24+
"bazelrio_org_wpilib_thirdparty_libssh_windowsarm64staticdebug",
25+
"bazelrio_org_wpilib_thirdparty_libssh_windowsx86-64static",
26+
"bazelrio_org_wpilib_thirdparty_libssh_windowsx86-64staticdebug",
3127
)
3228

3329
setup_bzlmodrio_libssh_java_dependencies = use_extension("//:maven_java_deps.bzl", "setup_bzlmodrio_libssh_java_dependencies")

0 commit comments

Comments
 (0)