Merge pull request #917 from gluon-lang/workflows

Switch to github actions

.github/workflows/release.yml

@@ -0,0 +1,26 @@
+name: release
+on:
+  push:
+    tags:
+      - '*'
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    - name: release
+      uses: actions/create-release@v1
+      id: create_release
+      with:
+        draft: false
+        prerelease: false
+        release_name: ${{ steps.version.outputs.version }}
+        tag_name: ${{ github.ref }}
+        body_path: CHANGELOG.md
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+    # Only run deployment on git tags
+    - CURRENT_TAG=`git describe --exact-match --abbrev=0 --tags || true`
+    - >
+        if [[ $CURRENT_TAG != "" ]]; then
+            export GIT_HASH=$(git rev-parse HEAD)
+            sh scripts/before_deploy.sh
+        fi

.github/workflows/rust.yml

@@ -0,0 +1,52 @@
+name: ci
+on:
+  pull_request:
+  push:
+    branches:
+    - master
+jobs:
+  test:
+    name: test
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        build: [stable]
+        include:
+        - build: stable
+          os: ubuntu-latest
+          rust: stable
+    env:
+      CRATE_NAME: gluon
+      CARGO_INCREMENTAL: 0 # Incremental compilation is slower and bloats the cache
+      RUST_BACKTRACE: 1
+      RUSTC_WRAPPER: sccache
+      SCCACHE_CACHE_SIZE: 500M
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+    - name: Install Rust
+      uses: hecrj/setup-rust-action@v1
+      with:
+        rust-version: ${{ matrix.rust }}
+    - uses: Swatinem/rust-cache@v1
+    - run: echo "$HOME/bin" >> $GITHUB_PATH
+    - run: mkdir -p $HOME/bin
+    - run: ./scripts/install_sccache.sh $TARGET
+    - run: sh scripts/install_cross.sh
+    - run: source ~/.cargo/env || true
+    - run: ./scripts/install_mdbook.sh $TARGET
+    - name: Run tests
+      run: >
+          if [ ! -z $DISABLE_TESTS ]; then
+              return
+          elif [[ -z ${WASM+set} ]]; then
+              mdbook build book
+              ./scripts/travis.sh
+              if ! git diff-index HEAD --; then
+                  echo "Detected changes in the source after running tests"
+                  exit 1
+              fi
+          else
+              rustup target add wasm32-unknown-unknown
+              cargo check --target wasm32-unknown-unknown -p gluon_c-api
+          fi

CHANGELOG.md

@@ -1,3 +1,8 @@
+<a name="v0.18.1"></a>
+## v0.18.1 (2021-10-03)
+
+*   Fix compilation of `gluon` with the `tokio` feature enabled
+
 <a name="v0.18.0"></a>
 ## v0.18.0 (2021-10-03)
 
@@ -1092,7 +1097,7 @@ Type errors should now be formatted much better and have more precise types.
 <a name="v0.4.0"></a>
 ## v0.4.0 (2017-05-16)
 
-Version 0.4.0 is a primarily a bug fix release with only a single significant feature as the upcoming features are all still WIP. 
+Version 0.4.0 is a primarily a bug fix release with only a single significant feature as the upcoming features are all still WIP.
 
 #### Features
 

Cargo.toml

@@ -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"
@@ -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

base/src/types/mod.rs

@@ -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>,
@@ -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!(

scripts/install_cross.sh

@@ -1,20 +1,13 @@
 set -ex
 
 main() {
-    local target=
-    if [ $TRAVIS_OS_NAME = linux ]; then
-        target=x86_64-unknown-linux-musl
-        sort=sort
-    else
-        target=x86_64-apple-darwin
-        sort=gsort  # for `sort --sort-version`, from brew's coreutils.
-    fi
+    local target=x86_64-unknown-linux-musl
 
     # This fetches latest stable release
     local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \
                        | cut -d/ -f3 \
                        | grep -E '^v[0.1.0-9.]+$' \
-                       | $sort --version-sort \
+                       | sort --version-sort \
                        | tail -n1)
     curl -LSfs https://japaric.github.io/trust/install.sh | \
         sh -s -- \

scripts/publish.sh

@@ -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

scripts/sync_publish.sh

@@ -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')