From 628df8849c9304195847d2c45ce350c33a71b877 Mon Sep 17 00:00:00 2001 From: youben11 Date: Tue, 13 Sep 2022 17:04:32 +0100 Subject: [PATCH] refactor: unify Makefile target naming style --- .github/workflows/continuous-integration.yml | 8 ++++---- README.md | 2 +- compiler/Makefile | 20 ++++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index d567fd8e6..53fb2d931 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -30,13 +30,13 @@ jobs: run: | cd compiler pip install -r lib/Bindings/Python/requirements_dev.txt - make check_python_format + make check-python-format - name: Lint with pylint (Python) run: | cd compiler # compiler requirements to lint pip install numpy - make python_lint + make python-lint - name: Linelint uses: fernandrone/linelint@0.0.4 id: linelint @@ -479,7 +479,7 @@ jobs: id: build-tarball run: | cd compiler - make release_tarballs + make release-tarballs sudo cp ${{ github.workspace }}/tarballs/concretecompiler.tar.gz ${{ github.workspace }}/tarballs/concretecompiler-`git describe --tags --abbrev=0`-x86_64-linux-gnu.tar.gz echo "::set-output name=ASSET_NAME::concretecompiler-`git describe --tags --abbrev=0`-x86_64-linux-gnu.tar.gz" @@ -545,7 +545,7 @@ jobs: RUSTFLAGS="-C target-cpu=native" cargo build --release - name: Update Python Version - run: cd compiler && make update_python_version + run: cd compiler && make update-python-version - name: Build id: build-wheel-macos diff --git a/README.md b/README.md index dd61e1614..1927e4b16 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ The final tarball contains intallation instructions. We only support Linux x86_6 ```bash $ cd compiler -$ make release_tarballs +$ make release-tarballs ``` ### Build the Python Package diff --git a/compiler/Makefile b/compiler/Makefile index fdc922179..70d5b5497 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -273,20 +273,20 @@ file-check: build-initialized not: build-initialized cmake --build $(BUILD_DIR) --target not -release_tarballs: +release-tarballs: docker image build -t concrete-compiler-manylinux:linux_x86_64_tarball -f ../builders/Dockerfile.release_tarball_linux_x86_64 .. docker container run --rm -v ${PWD}/../tarballs:/tarballs_volume concrete-compiler-manylinux:linux_x86_64_tarball cp -r /tarballs/. /tarballs_volume/. -update_python_version: +update-python-version: echo "__version__ = \"`git describe --tags --abbrev=0 | grep -e '[0-9].*' -o`\"" > lib/Bindings/Python/version.txt -check_python_format: +check-python-format: black --check tests/python/ lib/Bindings/Python/concrete/ -python_format: +python-format: black tests/python/ lib/Bindings/Python/concrete/ -python_lint: +python-lint: pylint --rcfile=../pylintrc lib/Bindings/Python/concrete/compiler .PHONY: build-initialized \ @@ -296,11 +296,11 @@ python_lint: add-deps \ file-check \ not \ - release_tarballs \ - update_python_version \ - python_lint \ - python_format \ - check_python_format \ + release-tarballs \ + update-python-version \ + python-lint \ + python-format \ + check-python-format \ concrete-optimizer-lib \ concrete-core-ffi \ build-tests \