From 2795b77f08d241001b81f78a2b929467490bf7a7 Mon Sep 17 00:00:00 2001 From: Sven-Hendrik Haase Date: Fri, 26 Mar 2021 23:47:36 +0100 Subject: Try to add freebsd support --- .github/workflows/publish.yml | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 05f1730..06e6358 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,9 +1,6 @@ name: Publish -on: - push: - tags: - - 'v*' +on: [push, pull_request] jobs: publish: @@ -23,6 +20,7 @@ jobs: - riscv64gc-unknown-linux-gnu - x86_64-pc-windows-msvc - x86_64-apple-darwin + - x86_64-unknown-freebsd include: - os: ubuntu-latest target: x86_64-unknown-linux-musl @@ -101,6 +99,13 @@ jobs: cross: false strip: true compress: true + - os: ubuntu-latest + target: x86_64-unknown-freebsd + artifact_name: target/x86_64-unknown-freebsd/release/miniserve + release_name: x86_64-unknown-freebsd + cross: true + strip: true + compress: true steps: - name: Checkout code @@ -126,25 +131,3 @@ jobs: args: --lzma strip: ${{ matrix.strip }} if: ${{ matrix.compress }} - - - name: Get tag name - id: tag_name - run: | - echo ::set-output name=current_version::${GITHUB_REF#refs/tags/v} - shell: bash - - - name: Get CHANGELOG.md entry - id: changelog_reader - uses: mindsers/changelog-reader-action@v1 - with: - version: ${{ steps.tag_name.outputs.current_version }} - path: ./CHANGELOG.md - - - name: Release - uses: svenstaro/upload-release-action@v2 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: ${{ matrix.artifact_name }} - tag: ${{ github.ref }} - asset_name: miniserve-$tag-${{ matrix.release_name }} - body: ${{ steps.changelog_reader.outputs.log_entry }} -- cgit v1.2.3 From 04711ff93270e8bae7ac2135bb5f3d0f0e5d913a Mon Sep 17 00:00:00 2001 From: Sven-Hendrik Haase Date: Sat, 27 Mar 2021 00:05:50 +0100 Subject: Add Cross.toml for FreeBSD --- Cross.toml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Cross.toml diff --git a/Cross.toml b/Cross.toml new file mode 100644 index 0000000..a7a84ad --- /dev/null +++ b/Cross.toml @@ -0,0 +1,3 @@ +# NOTE: Custom image specification for freebsd is required until new version of cross is released. +[target.x86_64-unknown-freebsd] +image = "rustembedded/cross:x86_64-unknown-freebsd" -- cgit v1.2.3 From 7e77950e1c567b929673b66d8b90141e1f6d1ed4 Mon Sep 17 00:00:00 2001 From: Sven-Hendrik Haase Date: Sat, 27 Mar 2021 01:38:44 +0100 Subject: Don't run upx for FreeBSD --- .github/workflows/publish.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 06e6358..47aeee1 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -104,8 +104,8 @@ jobs: artifact_name: target/x86_64-unknown-freebsd/release/miniserve release_name: x86_64-unknown-freebsd cross: true - strip: true - compress: true + strip: false + compress: false steps: - name: Checkout code -- cgit v1.2.3 From 1f913420432b0c61fb8efc85f18b534db084599b Mon Sep 17 00:00:00 2001 From: Sven-Hendrik Haase Date: Sat, 27 Mar 2021 01:57:13 +0100 Subject: Re-add publish instructions --- .github/workflows/publish.yml | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 47aeee1..53480cd 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,6 +1,9 @@ name: Publish -on: [push, pull_request] +on: + push: + tags: + - 'v*' jobs: publish: @@ -131,3 +134,25 @@ jobs: args: --lzma strip: ${{ matrix.strip }} if: ${{ matrix.compress }} + + - name: Get tag name + id: tag_name + run: | + echo ::set-output name=current_version::${GITHUB_REF#refs/tags/v} + shell: bash + + - name: Get CHANGELOG.md entry + id: changelog_reader + uses: mindsers/changelog-reader-action@v1 + with: + version: ${{ steps.tag_name.outputs.current_version }} + path: ./CHANGELOG.md + + - name: Release + uses: svenstaro/upload-release-action@v2 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ${{ matrix.artifact_name }} + tag: ${{ github.ref }} + asset_name: miniserve-$tag-${{ matrix.release_name }} + body: ${{ steps.changelog_reader.outputs.log_entry }} -- cgit v1.2.3