Merge branch 'Aloxaf:master' into master

dreness · Jul 3, 2022 · 9e78de1 · 9e78de1
2 parents 9fc9e00 + e3311d7
commit 9e78de1
Show file tree

Hide file tree

Showing 26 changed files with 1,630 additions and 1,289 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,27 @@
+version: 2
+updates:
+- package-ecosystem: cargo
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "21:00"
+  open-pull-requests-limit: 10
+  assignees:
+  - Aloxaf
+  ignore:
+  - dependency-name: anyhow
+    versions:
+    - 1.0.38
+    - 1.0.39
+  - dependency-name: env_logger
+    versions:
+    - 0.8.3
+  - dependency-name: image
+    versions:
+    - 0.23.13
+  - dependency-name: log
+    versions:
+    - 0.4.14
+  - dependency-name: tempfile
+    versions:
+    - 3.2.0
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,58 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+env:
+  RUST_BACKTRACE: 1
+
+jobs:
+
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+        with:
+          fetch-depth: 1
+
+      - name: Install rust
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly
+          components: rustfmt, clippy
+          override: true
+
+      - name: APT update
+        run: sudo apt-get update
+
+      - name: Install dependencies
+        run: sudo apt-get install libx11-xcb-dev libxcb-shape0-dev libxcb-xfixes0-dev
+
+      - name: Cargo fmt
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: -- --check
+
+      - name: Cargo clippy
+        uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --all-features
+
+      - name: Cargo check
+        uses: actions-rs/cargo@v1
+        with:
+          command: check
+
+      - name: Cargo test
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: -- --nocapture
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,115 @@
+on:
+  push:
+    tags:
+    - 'v*'
+
+name: Release
+
+jobs:
+  create_release:
+    runs-on: ubuntu-latest
+    outputs: 
+      upload_url: ${{ steps.create_release.outputs.upload_url }} 
+    steps:
+      - id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          draft: false
+          prerelease: false
+
+  release-linux:
+    name: x86_64-unknown-linux-gnu
+    needs: create_release
+    runs-on: ubuntu-latest
+    steps:
+      - run: |
+          sudo apt-get update
+          sudo apt-get install libx11-xcb-dev libxcb-shape0-dev libxcb-xfixes0-dev
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 1
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+      - uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --release
+      - id: get_name
+        run: |
+          echo ::set-output name=NAME::silicon-${GITHUB_REF/refs\/tags\//}-x86_64-unknown-linux-gnu.tar.gz
+      - run: |
+          tar czf ${{ steps.get_name.outputs.NAME }} -C ./target/release silicon
+      - uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.create_release.outputs.upload_url }}
+          asset_path: ./${{ steps.get_name.outputs.NAME }}
+          asset_name: ${{ steps.get_name.outputs.NAME }}
+          asset_content_type: application/zip
+
+  release-macos:
+    name: x86_64-apple-darwin
+    needs: create_release
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+      - uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --release
+      - id: get_name
+        run: |
+          echo ::set-output name=NAME::silicon-${GITHUB_REF/refs\/tags\//}-x86_64-apple-darwin.tar.gz
+      - run: |
+          tar czf ${{ steps.get_name.outputs.NAME }} -C ./target/release silicon
+      - uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.create_release.outputs.upload_url }}
+          asset_path: ./${{ steps.get_name.outputs.NAME }}
+          asset_name: ${{ steps.get_name.outputs.NAME }}
+          asset_content_type: application/zip
+
+  release-windows:
+    name: x86_64-pc-windows-msvc
+    needs: create_release
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+      - uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --release
+      - id: get_name
+        shell: bash
+        run: |
+          echo ::set-output name=NAME::silicon-${GITHUB_REF/refs\/tags\//}-x86_64-pc-windows-msvc.tar.gz
+          echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+      - shell: bash
+        run: |
+          shopt -s extglob
+          tar czf ${{ steps.get_name.outputs.NAME }} -C ./target/release silicon.exe
+      - uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.create_release.outputs.upload_url }}
+          asset_path: ./${{ steps.get_name.outputs.NAME }}
+          asset_name: ${{ steps.get_name.outputs.NAME }}
+          asset_content_type: application/zip
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /target
 **/*.rs.bk
-/.idea
+/.idea
+.vscode
diff --git a/.travis.yml b/.travis.yml