Merge pull request #97 from richiksc/master

Update Cargo.lock, updates cc to 1.0.66
This commit is contained in:
phiresky 2021-01-26 16:14:51 +01:00 committed by GitHub
commit 0d3c8d4075
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 261 additions and 210 deletions

View File

@ -79,9 +79,9 @@ jobs:
# FIXME: to work around bugs in latest cross release, install master. # FIXME: to work around bugs in latest cross release, install master.
# See: https://github.com/rust-embedded/cross/issues/357 # See: https://github.com/rust-embedded/cross/issues/357
cargo install --git https://github.com/rust-embedded/cross cargo install --git https://github.com/rust-embedded/cross
echo "::set-env name=CARGO::cross" echo "CARGO=cross" >> $GITHUB_ENV
echo "::set-env name=TARGET_FLAGS::--target ${{ matrix.target }}" echo ":TARGET_FLAGS=--target ${{ matrix.target }}">> $GITHUB_ENV
echo "::set-env name=TARGET_DIR::./target/${{ matrix.target }}" echo "TARGET_DIR=./target/${{ matrix.target }}" >> $GITHUB_ENV
- name: Show command used for Cargo - name: Show command used for Cargo
run: | run: |

View File

@ -36,7 +36,7 @@ jobs:
# Apparently, this is the right way to get a tag name. Really? # Apparently, this is the right way to get a tag name. Really?
# #
# See: https://github.community/t5/GitHub-Actions/How-to-get-just-the-tag-name/m-p/32167/highlight/true#M1027 # See: https://github.community/t5/GitHub-Actions/How-to-get-just-the-tag-name/m-p/32167/highlight/true#M1027
echo "::set-env name=RG_VERSION::${GITHUB_REF#refs/tags/}" echo "RG_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
echo "version is: ${{ env.RG_VERSION }}" echo "version is: ${{ env.RG_VERSION }}"
- name: Create GitHub release - name: Create GitHub release
@ -129,9 +129,9 @@ jobs:
# FIXME: to work around bugs in latest cross release, install master. # FIXME: to work around bugs in latest cross release, install master.
# See: https://github.com/rust-embedded/cross/issues/357 # See: https://github.com/rust-embedded/cross/issues/357
cargo install --git https://github.com/rust-embedded/cross cargo install --git https://github.com/rust-embedded/cross
echo "::set-env name=CARGO::cross" echo "CARGO=cross" >> $GITHUB_ENV
echo "::set-env name=TARGET_FLAGS::--target ${{ matrix.target }}" echo ":TARGET_FLAGS=--target ${{ matrix.target }}">> $GITHUB_ENV
echo "::set-env name=TARGET_DIR::./target/${{ matrix.target }}" echo "TARGET_DIR=./target/${{ matrix.target }}" >> $GITHUB_ENV
- name: Show command used for Cargo - name: Show command used for Cargo
run: | run: |
@ -149,10 +149,10 @@ jobs:
shell: bash shell: bash
run: | run: |
release_upload_url="$(cat artifacts/release-upload-url)" release_upload_url="$(cat artifacts/release-upload-url)"
echo "::set-env name=RELEASE_UPLOAD_URL::$release_upload_url" echo "RELEASE_UPLOAD_URL=$release_upload_url" >> $GITHUB_ENV
echo "release upload url: $RELEASE_UPLOAD_URL" echo "release upload url: $RELEASE_UPLOAD_URL"
release_version="$(cat artifacts/release-version)" release_version="$(cat artifacts/release-version)"
echo "::set-env name=RELEASE_VERSION::$release_version" echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
echo "release version: $RELEASE_VERSION" echo "release version: $RELEASE_VERSION"
- name: Build release binary - name: Build release binary
@ -186,12 +186,12 @@ jobs:
cp "target/${{ matrix.target }}/release/rga.exe" "$staging/" cp "target/${{ matrix.target }}/release/rga.exe" "$staging/"
cp "target/${{ matrix.target }}/release/rga-preproc.exe" "$staging/" cp "target/${{ matrix.target }}/release/rga-preproc.exe" "$staging/"
7z a "$staging.zip" "$staging" 7z a "$staging.zip" "$staging"
echo "::set-env name=ASSET::$staging.zip" echo "ASSET=$staging.zip" >> $GITHUB_ENV
else else
cp "target/${{ matrix.target }}/release/rga" "$staging/" cp "target/${{ matrix.target }}/release/rga" "$staging/"
cp "target/${{ matrix.target }}/release/rga-preproc" "$staging/" cp "target/${{ matrix.target }}/release/rga-preproc" "$staging/"
tar czf "$staging.tar.gz" "$staging" tar czf "$staging.tar.gz" "$staging"
echo "::set-env name=ASSET::$staging.tar.gz" echo "ASSET=$staging.tar.gz" >> $GITHUB_ENV
fi fi
- name: Upload release archive - name: Upload release archive

449
Cargo.lock generated

File diff suppressed because it is too large Load Diff