2549: Fix CI checking version compatibility r=irevoire a=curquiza

- Fix CI checks in `if` regarding the `stable` variable created
- Fix command to remove prefix `refs/tags/v` from `GITHUB_REF` in `check-release.sh` script
- Change from `sh` to `bash` for `check-release.sh` script
- Fix error message

Co-authored-by: Clémentine Urquizar <clementine@meilisearch.com>
This commit is contained in:
bors[bot] 2022-06-27 08:28:31 +00:00 committed by GitHub
commit 688d6f704b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 11 deletions

View File

@ -1,15 +1,15 @@
#!/bin/sh #!/bin/bash
# check_tag $current_tag $file_tag $file_name # check_tag $current_tag $file_tag $file_name
function check_tag { function check_tag {
if [ "$1" != "$2" ]; then if [[ "$1" != "$2" ]]; then
echo "Error: the current tag does not match the version in $3: found $1 - expected $2" echo "Error: the current tag does not match the version in $3: found $2 - expected $1"
ret=1 ret=1
fi fi
} }
ret=0 ret=0
current_tag=$(echo $GITHUB_REF | tr -d 'refs/tags/v') current_tag=${GITHUB_REF#'refs/tags/v'}
toml_files='*/Cargo.toml' toml_files='*/Cargo.toml'
for toml_file in $toml_files; for toml_file in $toml_files;
@ -22,7 +22,7 @@ lock_file='Cargo.lock'
lock_tag=$(grep -A 1 'name = "meilisearch-auth"' $lock_file | grep version | cut -d '=' -f 2 | tr -d '"' | tr -d ' ') lock_tag=$(grep -A 1 'name = "meilisearch-auth"' $lock_file | grep version | cut -d '=' -f 2 | tr -d '"' | tr -d ' ')
check_tag $current_tag $lock_tag $lock_file check_tag $current_tag $lock_tag $lock_file
if [ "$ret" -eq 0 ] ; then if [[ "$ret" -eq 0 ]] ; then
echo 'OK' echo 'OK'
fi fi
exit $ret exit $ret

View File

@ -11,7 +11,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Check release validity - name: Check release validity
run: sh .github/scripts/check-release.sh run: bash .github/scripts/check-release.sh
publish: publish:
name: Publish binary for ${{ matrix.os }} name: Publish binary for ${{ matrix.os }}

View File

@ -11,7 +11,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Check release validity - name: Check release validity
run: sh .github/scripts/check-release.sh run: bash .github/scripts/check-release.sh
debian: debian:
name: Publish debian packagge name: Publish debian packagge

View File

@ -32,8 +32,8 @@ jobs:
# Check only the validity of the tag for official releases (not for pre-releases or other tags) # Check only the validity of the tag for official releases (not for pre-releases or other tags)
- name: Check release validity - name: Check release validity
if: github.event_name != 'schedule' && steps.check-tag-format.outputs.stable if: github.event_name != 'schedule' && steps.check-tag-format.outputs.stable == 'true'
run: sh .github/scripts/check-release.sh run: bash .github/scripts/check-release.sh
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v1 uses: docker/setup-qemu-action@v1
@ -58,8 +58,8 @@ jobs:
flavor: latest=false flavor: latest=false
tags: | tags: |
type=ref,event=tag type=ref,event=tag
type=semver,pattern=v{{major}}.{{minor}},enable=${{ steps.check-tag-format.outputs.stable }} type=semver,pattern=v{{major}}.{{minor}},enable=${{ steps.check-tag-format.outputs.stable == 'true' }}
type=raw,value=latest,enable=${{ steps.check-tag-format.outputs.stable }} type=raw,value=latest,enable=${{ steps.check-tag-format.outputs.stable == 'true' }}
- name: Build and push - name: Build and push
id: docker_build id: docker_build