Skip to content

Commit

Permalink
Bump deps (#2555)
Browse files Browse the repository at this point in the history
  • Loading branch information
appaquet authored Jun 29, 2024
1 parent f938c3a commit 3b416a3
Show file tree
Hide file tree
Showing 7 changed files with 1,039 additions and 603 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ jobs:
bin: exm
cross: true
- target: x86_64-apple-darwin
os: macOS-11
os: macos-14
bin: exm
cross: false
- target: aarch64-apple-darwin
os: macOS-11
os: macos-14
bin: exm
cross: false
- target: x86_64-pc-windows-msvc
Expand Down Expand Up @@ -153,7 +153,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-11, ubuntu-latest, windows-latest]
os: [macos-14, ubuntu-latest, windows-latest]

steps:
- uses: actions/checkout@v4
Expand All @@ -178,7 +178,7 @@ jobs:
yarn electron_dist
mkdir pkg
if [ "${{ matrix.os }}" == "macos-11" ]; then
if [ "${{ matrix.os }}" == "macos-14" ]; then
mv dist/Exomind-*-arm64.dmg pkg/exomind-electron-macos-aarch64.dmg
mv dist/Exomind-*.dmg pkg/exomind-electron-macos-x86_64.dmg
elif [ "${{ matrix.os }}" == "ubuntu-latest" ]; then
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/push-tester.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- target: x86_64-unknown-linux-gnu
os: ubuntu-latest
- target: x86_64-apple-darwin
os: macOS-11
os: macos-14
- target: x86_64-pc-windows-msvc
os: windows-latest

Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
os: ubuntu-latest
cross: true
- target: aarch64-apple-darwin
os: macOS-11
os: macos-14
cross: false

runs-on: ${{ matrix.pair.os }}
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
NODE_OPTIONS: "--openssl-legacy-provider"

ios_build:
runs-on: macos-11
runs-on: macos-14
steps:
- uses: actions/checkout@v4

Expand All @@ -176,10 +176,6 @@ jobs:
with:
node-version: 18.x

- name: Select latest Xcode
run: |
sudo xcode-select -s "/Applications/Xcode_13.2.1.app" # select latest xcode
- name: Install dependencies
run: |
HOMEBREW_NO_INSTALL_CLEANUP=1 brew install swift-protobuf
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodejs 18
nodejs 20
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion exm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ exomind-protos = {version = "0.1.15", path = "../protos"}
exomind-gmail = {version = "0.1.15", path = "../integrations/gmail"}
log = "0.4.21"
structopt = "0.3.26"
tokio = { version = "1.35.1", features = ["macros", "rt-multi-thread", "time"] }
tokio = { version = "1.36.0", features = ["macros", "rt-multi-thread", "time"] }

[dev-dependencies]
exocore = { version = "0.1.25", default-features = false, features = ["client", "logger", "tests-utils"] }
4 changes: 2 additions & 2 deletions protos/protobuf/google/protobuf/descriptor.proto
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
// https://developers.google.com/protocol-buffers/
// https://protobuf.dev/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
Expand Down Expand Up @@ -339,7 +339,7 @@ message MethodDescriptorProto {
// extension number. You can declare multiple options with only one extension
// number by putting them in a sub-message. See the Custom Options section of
// the docs for examples:
// https://developers.google.com/protocol-buffers/docs/proto#options
// https://protobuf.dev/docs/proto#options
// If this turns out to be popular, a web service will be set up
// to automatically assign option numbers.

Expand Down
Loading

0 comments on commit 3b416a3

Please sign in to comment.