Skip to content

Commit

Permalink
Automated PR for harmonizer release 2.6.3 (#440)
Browse files Browse the repository at this point in the history
Automated changes by
[create-pull-request](https://github.com/peter-evans/create-pull-request)
GitHub action

---------

Co-authored-by: apollo-bot2 <apollo-bot2@users.noreply.github.com>
Co-authored-by: ApolloBot2 <support@apollographql.com>
  • Loading branch information
3 people authored Jan 11, 2024
1 parent 4c89f5c commit 1b21321
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 37 deletions.
4 changes: 2 additions & 2 deletions federation-2/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 federation-2/harmonizer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "harmonizer"
version = "2.6.2"
version = "2.6.3"
authors = ["Apollo <packages@apollographql.com>"]
edition = "2018"
description = "Apollo Federation utility to compose a supergraph from subgraphs"
Expand Down
54 changes: 27 additions & 27 deletions federation-2/harmonizer/package-lock.json

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

4 changes: 2 additions & 2 deletions federation-2/harmonizer/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@apollo/harmonizer-2",
"private": true,
"version": "2.6.2",
"version": "2.6.3",
"description": "Apollo Federation Harmonizer JS Entrypoint",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down Expand Up @@ -29,7 +29,7 @@
"npm": ">=7 <10"
},
"dependencies": {
"@apollo/composition": "2.6.2"
"@apollo/composition": "2.6.3"
},
"peerDependencies": {
"graphql": "^15.7.0 || ^16.0.0"
Expand Down
2 changes: 1 addition & 1 deletion federation-2/supergraph/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "supergraph"
version = "2.6.2"
version = "2.6.3"
edition = "2021"
publish = false

Expand Down
7 changes: 3 additions & 4 deletions xtask/src/utils.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use anyhow::{anyhow, Context, Result};
use anyhow::{anyhow, Result};
use camino::Utf8PathBuf;
use lazy_static::lazy_static;

use std::{convert::TryFrom, env, str};
use std::{convert::From, env, str};

const MANIFEST_DIR: &str = env!("CARGO_MANIFEST_DIR");

Expand Down Expand Up @@ -47,8 +47,7 @@ pub(crate) fn get_workspace_roots() -> Result<Vec<Utf8PathBuf>> {
}

fn project_root() -> Result<Utf8PathBuf> {
let manifest_dir = Utf8PathBuf::try_from(MANIFEST_DIR)
.with_context(|| "Could not find the root directory.")?;
let manifest_dir = Utf8PathBuf::from(MANIFEST_DIR);
let root_dir = manifest_dir
.ancestors()
.nth(1)
Expand Down

0 comments on commit 1b21321

Please sign in to comment.