diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 28d4b26..ead3846 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -17,23 +17,24 @@ jobs: uses: actions/checkout@v4 - name: Build and run tests run: make run-tests - - uses: actions/upload-artifact@main + - uses: actions/upload-artifact@v4 with: name: libtokenizers.a path: ./testTarget/libtokenizers.a - - uses: actions/upload-artifact@main + - uses: actions/upload-artifact@v4 with: name: onnxruntime.so path: ./testTarget/onnxruntime.so release: name: Release pushed tag runs-on: ubuntu-latest + needs: test steps: - - uses: actions/download-artifact@master + - uses: actions/download-artifact@v4 with: - name: libtokenizers + name: libtokenizers.a path: ./libtokenizers.a - - uses: actions/download-artifact@master + - uses: actions/download-artifact@v4 with: name: onnxruntime.so path: ./onnxruntime.so @@ -42,9 +43,9 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} tag: ${{ github.ref_name }} run: | - gh release create "$tag" \ - --repo="$GITHUB_REPOSITORY" \ - --title="${GITHUB_REPOSITORY#*/} ${tag#v}" \ - --generate-notes \ - './onnxruntime.so#onnxruntime.so' \ - './libtokenizers.a#libtokenizers.a' + gh release create "$tag" && \ + --repo="$GITHUB_REPOSITORY" && \ + --title="${GITHUB_REPOSITORY#*/} ${tag#v}" && \ + --generate-notes && \ + '/home/runner/work/hugot/hugot/onnxruntime.so' && \ + '/home/runner/work/hugot/hugot/libtokenizers.a' diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a645b2a..e955bcc 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -14,3 +14,11 @@ jobs: uses: actions/checkout@v4 - name: Build and run tests run: make run-tests + - uses: actions/upload-artifact@v4 + with: + name: libtokenizers.a + path: ./testTarget/libtokenizers.a + - uses: actions/upload-artifact@v4 + with: + name: onnxruntime.so + path: ./testTarget/onnxruntime.so diff --git a/Dockerfile b/Dockerfile index 7a08db2..cacffd1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ ARG GO_VERSION=1.22.0 -ARG RUST_VERSION=1.75 +ARG RUST_VERSION=1.76 ARG ONNXRUNTIME_VERSION=1.17.0 #--- rust build of tokenizer diff --git a/go.mod b/go.mod index be4b53b..fad9006 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( require ( cloud.google.com/go/storage v1.37.0 // indirect - github.com/aws/aws-sdk-go v1.50.15 // indirect + github.com/aws/aws-sdk-go v1.50.21 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-errors/errors v1.5.1 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect diff --git a/go.sum b/go.sum index 89f4c5b..239a602 100644 --- a/go.sum +++ b/go.sum @@ -8,8 +8,8 @@ cloud.google.com/go/iam v1.1.5 h1:1jTsCu4bcsNsE4iiqNT5SHwrDRCfRmIaaaVFhRveTJI= cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8= cloud.google.com/go/storage v1.37.0 h1:WI8CsaFO8Q9KjPVtsZ5Cmi0dXV25zMoX0FklT7c3Jm4= cloud.google.com/go/storage v1.37.0/go.mod h1:i34TiT2IhiNDmcj65PqwCjcoUX7Z5pLzS8DEmoiFq1k= -github.com/aws/aws-sdk-go v1.50.15 h1:wEMnPfEQQFaoIJwuO18zq/vtG4Ft7NxQ3r9xlEi/8zg= -github.com/aws/aws-sdk-go v1.50.15/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.50.21 h1:W8awpwiInOt4qHQE6JghRYQJhHcf/cDJS3mlZYqioSQ= +github.com/aws/aws-sdk-go v1.50.21/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/scripts/run-unit-tests.sh b/scripts/run-unit-tests.sh index 4c7a697..c65c68c 100755 --- a/scripts/run-unit-tests.sh +++ b/scripts/run-unit-tests.sh @@ -27,7 +27,7 @@ docker compose -f $src_dir/.ci/docker-compose.yaml up && \ docker compose -f $src_dir/.ci/docker-compose.yaml logs --no-color >& $test_folder/logs.txt && \ echo "Extracting lib artifacts" id=$(docker ps -aqf "name=hugot") -echo $id docker cp $id:/usr/lib/libtokenizers.a ./testTarget/libtokenizers.a docker cp $id:/usr/lib64/onnxruntime.so ./testTarget/onnxruntime.so -docker compose -f $src_dir/.ci/docker-compose.yaml rm -fsv \ No newline at end of file +echo $id +docker compose -f $src_dir/.ci/docker-compose.yaml rm -fsv