Skip to content

Commit

Permalink
Fix publish script and compilations in some cicumstances
Browse files Browse the repository at this point in the history
Closes #912
  • Loading branch information
Marwes committed Oct 3, 2021
1 parent 0c3351b commit 4bd920b
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "gluon"
version = "0.18.0" # GLUON
version = "0.18.1" # GLUON
authors = ["Markus <marwes91@gmail.com>"]
keywords = ["script", "scripting", "language"]
build = "build.rs"
Expand Down Expand Up @@ -49,7 +49,7 @@ serde = { version = "1.0.130", optional = true }
serde_state = { version = "0.4.8", optional = true }
serde_derive_state = { version = "0.4.10", optional = true }

tokio = { version = "1.12.0", features = ["sync"], optional = true }
tokio = { version = "1.12.0", features = ["sync", "rt"], optional = true }
tokio-stream = { version = "0.1", features = ["net"], optional = true }

# Binding crates
Expand Down
8 changes: 4 additions & 4 deletions base/src/types/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1037,10 +1037,6 @@ where
}
}

#[cfg(target_pointer_width = "64")]
// Safeguard against accidentally growing Type as it is a core type
const _: [(); 8 * 6] = [(); std::mem::size_of::<Type<Symbol, ArcType>>()];

impl<Id, T> Type<Id, T>
where
T: TypePtr<Id = Id>,
Expand Down Expand Up @@ -4628,6 +4624,10 @@ where
mod tests {
use super::*;

#[cfg(target_pointer_width = "64")]
// Safeguard against accidentally growing Type as it is a core type
const _: [(); 8 * 6] = [(); std::mem::size_of::<Type<Symbol, ArcType>>()];

#[test]
fn walk_move_types_test() {
assert_eq!(
Expand Down
3 changes: 2 additions & 1 deletion scripts/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ for PROJECT in "${PROJECTS[@]}"
do
PROJECT_PATH=$(echo "$PROJECT" | sed 's/gluon_//' | sed 's/gluon/./')

if ! (sync_publish "${PROJECT_PATH}" -f "$@"); then
if ! (./scripts/sync_publish.sh "$(pwd)/${PROJECT_PATH}" -f "$@"); then
echo "Failed to publish $PROJECT_PATH"
exit 1
fi
done
2 changes: 1 addition & 1 deletion scripts/sync_publish.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ TMP_DIR=/tmp/test1
DIR="$1"
FORCE="$2"

NAME=$(grep '^name' "$DIR/Cargo.toml" | sed 's/name = "\([^"]*\)"/\1/')
NAME=$(grep '^name' "$DIR/Cargo.toml" | head -n 1 | sed 's/name = "\([^"]*\)"/\1/')
cd "$DIR"

VERSION=$(cargo metadata --format-version 1 2>/dev/null | jq -r '.packages[] | select(.name=="'$NAME'").version')
Expand Down

0 comments on commit 4bd920b

Please sign in to comment.