mirror of https://github.com/0xERR0R/blocky.git
cleanup
This commit is contained in:
parent
7f28a9e32c
commit
7b3a28e762
|
@ -38,14 +38,14 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Input Check
|
||||
id: check
|
||||
run: |
|
||||
if [[ "${{ inputs.goos }}" == "windows" && "${{ inputs.goarch }}" == "arm" ]] || \
|
||||
[[ "${{ inputs.goos }}" == "windows" && "${{ inputs.goarch }}" == "arm64" ]] || \
|
||||
[[ "${{ inputs.goos }}" == "netbsd" && "${{ inputs.goarch }}" == "arm64" ]] || \
|
||||
[[ "${{ inputs.goos }}" == "darwin" && "${{ inputs.goarch }}" == "arm" ]]; then
|
||||
echo "## Unsupported input: Combination goos=${{ inputs.goarch }} goarch=${{ inputs.goarch }} is not supported" \
|
||||
>> $GITHUB_STEP_SUMMARY
|
||||
echo "## Unsupported input" >> $GITHUB_STEP_SUMMARY
|
||||
echo "" >> $GITHUB_STEP_SUMMARY
|
||||
echo "Combination goos=${{ inputs.goarch }} goarch=${{ inputs.goarch }} is not supported" >> $GITHUB_STEP_SUMMARY
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
@ -73,6 +73,7 @@ jobs:
|
|||
- name: Get variables
|
||||
id: get_vars
|
||||
run: |
|
||||
# Check if the repository is forked and add upstream for correct versioning
|
||||
if [[ "${{ github.repository_owner }}" != "0xERR0R" ]]; then
|
||||
git remote add upstream https://github.com/0xERR0R/blocky.git
|
||||
git fetch upstream
|
||||
|
@ -80,8 +81,10 @@ jobs:
|
|||
echo "version=$(git describe --always --tags)" >> $GITHUB_OUTPUT
|
||||
if [[ "${{ inputs.goarch }}" == "arm" ]]; then
|
||||
echo "arch=${{ inputs.goarch }}${{ inputs.goarm }}" >> $GITHUB_OUTPUT
|
||||
echo "arm=${{ inputs.goarm }}" >> $GITHUB_OUTPUT
|
||||
else
|
||||
echo "arch=${{ inputs.goarch }}" >> $GITHUB_OUTPUT
|
||||
echo "arm=" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
- name: Build
|
||||
|
@ -92,13 +95,9 @@ jobs:
|
|||
CXX: zigcpp
|
||||
GOOS: ${{ inputs.goos }}
|
||||
GOARCH: ${{ inputs.goarch }}
|
||||
GOARM: ${{ inputs.goarm }}
|
||||
GOARM: ${{ steps.get_vars.outputs.arm }}
|
||||
VERSION: ${{ steps.get_vars.outputs.version }}
|
||||
run: |
|
||||
if [[ "${{ inputs.goarch }}" != "arm" ]]; then
|
||||
unset GOARM
|
||||
fi
|
||||
make build
|
||||
run: make build
|
||||
|
||||
- name: Rename binary
|
||||
if: inputs.goos == 'windows'
|
||||
|
|
Loading…
Reference in New Issue