Skip to content

Commit

Permalink
Disable vendored openssl, enforce rustls in reqwuest and run on ubunt…
Browse files Browse the repository at this point in the history
…u latest
  • Loading branch information
timonv committed Dec 20, 2024
1 parent 0f776b8 commit adcdb1d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ on:
jobs:
# Run 'dist plan' (or host) to determine what tasks we need to do
plan:
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-latest"
outputs:
val: ${{ steps.plan.outputs.manifest }}
tag: ${{ !github.event.pull_request && github.ref_name || '' }}
Expand Down Expand Up @@ -172,7 +172,7 @@ jobs:
needs:
- plan
- build-local-artifacts
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-latest"
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
Expand Down Expand Up @@ -222,7 +222,7 @@ jobs:
if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }}
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-latest"
outputs:
val: ${{ steps.host.outputs.manifest }}
steps:
Expand Down Expand Up @@ -286,7 +286,7 @@ jobs:
# still allowing individual publish jobs to skip themselves (for prereleases).
# "host" however must run to completion, no skipping allowed!
if: ${{ always() && needs.host.result == 'success' }}
runs-on: "ubuntu-20.04"
runs-on: "ubuntu-latest"
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
Expand Down
5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ tera = "1.20.0"
lazy_static = "1.5.0"
rust-embed = { version = "8.5.0", features = ["debug-embed"] }
ratatui-splash-screen = "0.1.4"
openssl-sys = { version = "0.9.104", features = ["vendored"] }
reqwest = { version = "0.12", features = ["rustls-tls"] }
# openssl-sys = { version = "0.9.104", features = ["vendored"] }

[dev-dependencies]
test-log = { version = "0.2.16", features = ["trace"] }
Expand All @@ -95,7 +96,7 @@ multiple_crate_versions = "allow"
needless_borrow = "allow"

[features]
default = ["otel"]
default = ["otel", "rustls"]
"test-layout" = []
"otel" = [
"dep:tracing-opentelemetry",
Expand Down
11 changes: 4 additions & 7 deletions dist-workspace.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,7 @@ ci = "github"
# The installers to generate for each app
installers = ["shell", "powershell"]
# Target platforms to build apps for (Rust target-triple syntax)
targets = [
"aarch64-apple-darwin",
"aarch64-unknown-linux-gnu",
"x86_64-apple-darwin",
"x86_64-unknown-linux-gnu",
"x86_64-pc-windows-msvc",
]
targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc"]
# Path that installers should place binaries in
install-path = "CARGO_HOME"
# Publish jobs to run in CI
Expand All @@ -28,6 +22,9 @@ pr-run-mode = "upload"
# Skip checking whether the specified configuration files are up to date
# allow-dirty = ["ci"]

[dist.github-custom-runners]
global = "ubuntu-latest"

[dist.dependencies.apt]
protobuf-compiler = "*"
libprotobuf-dev = "*"
Expand Down

0 comments on commit adcdb1d

Please sign in to comment.