Merge pull request #16 from comit-network/release-fixes

Author: thomaseizinger

.github/dependabot.yml

@@ -0,0 +1,18 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "cargo"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    rebase-strategy: "disabled"
+      
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    rebase-strategy: "disabled"

.github/workflows/build-release-binaries.yml

@@ -24,13 +24,24 @@ jobs:
           ref: ${{ github.event.release.target_commitish }}
           token: ${{ secrets.BOTTY_GITHUB_TOKEN }}
 
+      - name: Install toolchain from rust-toolchain file
+        run: rustup show
+
       - uses: Swatinem/[email protected]
+        with:
+          key: ${{ matrix.target }}
 
-      - name: Build ${{ matrix.target }} rendezvous-server release binary
+      - name: Install compiler for armhf arch
+        if: matrix.target == 'armv7-unknown-linux-gnueabihf'
+        run: |
+          sudo apt-get update
+          sudo apt-get install gcc-arm-linux-gnueabihf
 
+      - name: Build ${{ matrix.target }} rendezvous-server release binary
         run: cargo build --target=${{ matrix.target }} --release --package rendezvous-server --bin rendezvous-server
 
       - name: Smoke test the binary
+        if: matrix.target != 'armv7-unknown-linux-gnueabihf'
         run: target/${{ matrix.target }}/release/rendezvous-server --help
 
       # Remove once python 3 is the default

.github/workflows/ci.yml

@@ -13,7 +13,12 @@ jobs:
       - name: Checkout sources
         uses: actions/[email protected]
 
+      - name: Install toolchain from rust-toolchain file
+        run: rustup show
+
       - uses: Swatinem/[email protected]
+        with:
+          key: ${{ matrix.target }}
 
       - name: Check formatting
         uses: dprint/[email protected]
@@ -38,18 +43,24 @@ jobs:
       - name: Checkout sources
         uses: actions/[email protected]
 
+      - name: Install toolchain from rust-toolchain file
+        run: rustup show
+
+      - uses: Swatinem/[email protected]
+        with:
+          key: ${{ matrix.target }}
+
       - name: Install compiler for armhf arch
         if: matrix.target == 'armv7-unknown-linux-gnueabihf'
         run: |
           sudo apt-get update
           sudo apt-get install gcc-arm-linux-gnueabihf
 
       - name: Build binary
-        run: |
-          cargo build -p rendezvous-server --target ${{ matrix.target }}
+        run: cargo build -p rendezvous-server --target ${{ matrix.target }}
 
       - name: Upload rendezvous-server binary
         uses: actions/upload-artifact@v2-preview
         with:
           name: rendezvous-server-${{ matrix.target }}
-          path: target/${{ matrix.target }}/debug/rendezvous-server
+          path: target/${{ matrix.target }}/debug/rendezvous-server

CHANGELOG.md

@@ -0,0 +1,12 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+Initial release.
+
+[Unreleased]: https://github.com/comit-network/rendezvous-server/compare/fba56c1...HEAD

Cargo.lock

@@ -8,8 +8,8 @@ edition = "2018"
 anyhow = "1"
 atty = "0.2"
 futures = { version = "0.3", default-features = false }
-libp2p = { git = "https://github.com/comit-network/rust-libp2p.git", rev = "4cacaf215b334d447faca8f4e361fe19c30d2162", default-features = false, features = [ "rendezvous", "tcp-tokio", "yamux", "mplex", "dns-tokio", "noise", "ping" ] }
+libp2p = { git = "https://github.com/comit-network/rust-libp2p.git", branch = "rendezvous", default-features = false, features = [ "rendezvous", "tcp-tokio", "yamux", "mplex", "dns-tokio", "noise", "ping" ] }
 structopt = { version = "0.3", default-features = false }
-tokio = { version = "1.8", features = [ "rt-multi-thread", "time", "macros", "sync", "process", "fs", "net", "io-util" ] }
+tokio = { version = "1", features = [ "rt-multi-thread", "time", "macros", "sync", "process", "fs", "net", "io-util" ] }
 tracing = { version = "0.1", features = [ "attributes" ] }
 tracing-subscriber = { version = "0.2", default-features = false, features = [ "fmt", "ansi", "env-filter", "chrono", "tracing-log", "json" ] }