From 6091788cbc207453f45e98f785f6187935a8c443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= Date: Wed, 27 Dec 2023 17:55:50 +0200 Subject: [PATCH 1/5] Add support for "package_whole_project_src". --- .github/workflows/reproducible-build.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml index 36abc82..57c2ae2 100644 --- a/.github/workflows/reproducible-build.yml +++ b/.github/workflows/reproducible-build.yml @@ -25,6 +25,9 @@ on: skip_preliminary_checks: type: boolean description: Skip preliminary checks. Never set this in production! + package_whole_project_src: + type: boolean + description: Include all project files in the packaged source (*.source.json) jobs: build: @@ -45,6 +48,7 @@ jobs: create_release = os.getenv("create_release", "").lower() == "true" attach_to_existing_release = os.getenv("attach_to_existing_release", "").lower() == "true" skip_preliminary_checks = os.getenv("skip_preliminary_checks", "").lower() == "true" + package_whole_project_src = os.getenv("package_whole_project_src", "").lower() == "true" logging.info(f"Image tag: {image_tag}") logging.info(f"Project path: {project_path}") @@ -52,6 +56,7 @@ jobs: logging.info(f"Create new release: {create_release}") logging.info(f"Attach output to existing release: {attach_to_existing_release}") logging.info(f"Skip preliminary checks: {skip_preliminary_checks}") + logging.info(f"Package whole project src: {package_whole_project_src}") if skip_preliminary_checks: logging.warning("You should never set 'skip_preliminary_checks', unless you really know what you are doing!") @@ -72,6 +77,7 @@ jobs: create_release: ${{ inputs.create_release }} attach_to_existing_release: ${{ inputs.attach_to_existing_release }} skip_preliminary_checks: ${{ inputs.skip_preliminary_checks }} + package_whole_project_src: ${{ inputs.package_whole_project_src }} - name: Checkout uses: actions/checkout@v3 @@ -117,7 +123,10 @@ jobs: - name: Build contracts run: | - python3 ./build_with_docker.py --no-docker-tty --image=multiversx/sdk-rust-contract-builder:${{ inputs.image_tag }} --project=${{ inputs.project_path }} --contract=${{ inputs.contract_name }} --output=/home/runner/work/output-from-docker + if ${{ inputs.package_whole_project_src }}; then + flag_package_whole_project_src="--package-whole-project-src" + fi + python3 ./build_with_docker.py --no-docker-tty --image=multiversx/sdk-rust-contract-builder:${{ inputs.image_tag }} --project=${{ inputs.project_path }} --contract=${{ inputs.contract_name }} --output=/home/runner/work/output-from-docker ${{ flag_package_whole_project_src }} - name: Save artifacts uses: actions/upload-artifact@v3 From 8fe5fca0e7e1d0a56418f1ef559bdf9b12a310c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= Date: Wed, 27 Dec 2023 17:59:27 +0200 Subject: [PATCH 2/5] Adjust passing flag. --- .github/workflows/reproducible-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml index 57c2ae2..feccef5 100644 --- a/.github/workflows/reproducible-build.yml +++ b/.github/workflows/reproducible-build.yml @@ -126,7 +126,7 @@ jobs: if ${{ inputs.package_whole_project_src }}; then flag_package_whole_project_src="--package-whole-project-src" fi - python3 ./build_with_docker.py --no-docker-tty --image=multiversx/sdk-rust-contract-builder:${{ inputs.image_tag }} --project=${{ inputs.project_path }} --contract=${{ inputs.contract_name }} --output=/home/runner/work/output-from-docker ${{ flag_package_whole_project_src }} + python3 ./build_with_docker.py --no-docker-tty --image=multiversx/sdk-rust-contract-builder:${{ inputs.image_tag }} --project=${{ inputs.project_path }} --contract=${{ inputs.contract_name }} --output=/home/runner/work/output-from-docker ${flag_package_whole_project_src} - name: Save artifacts uses: actions/upload-artifact@v3 From 67554b32f2e7378835cb97ee7a6530f43e2eb627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= Date: Wed, 27 Dec 2023 18:01:56 +0200 Subject: [PATCH 3/5] Fix passing param. --- .github/workflows/reproducible-build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml index feccef5..28d096c 100644 --- a/.github/workflows/reproducible-build.yml +++ b/.github/workflows/reproducible-build.yml @@ -123,10 +123,7 @@ jobs: - name: Build contracts run: | - if ${{ inputs.package_whole_project_src }}; then - flag_package_whole_project_src="--package-whole-project-src" - fi - python3 ./build_with_docker.py --no-docker-tty --image=multiversx/sdk-rust-contract-builder:${{ inputs.image_tag }} --project=${{ inputs.project_path }} --contract=${{ inputs.contract_name }} --output=/home/runner/work/output-from-docker ${flag_package_whole_project_src} + python3 ./build_with_docker.py --no-docker-tty --image=multiversx/sdk-rust-contract-builder:${{ inputs.image_tag }} --project=${{ inputs.project_path }} --contract=${{ inputs.contract_name }} --output=/home/runner/work/output-from-docker --package-whole-project-src=${{ inputs.package_whole_project_src }} - name: Save artifacts uses: actions/upload-artifact@v3 From 870f585842c20dc34be545d089303e37879b6836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= Date: Wed, 27 Dec 2023 18:42:31 +0200 Subject: [PATCH 4/5] Fix passing flag (trial and error). --- .github/workflows/reproducible-build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml index 28d096c..bed24c1 100644 --- a/.github/workflows/reproducible-build.yml +++ b/.github/workflows/reproducible-build.yml @@ -123,7 +123,11 @@ jobs: - name: Build contracts run: | - python3 ./build_with_docker.py --no-docker-tty --image=multiversx/sdk-rust-contract-builder:${{ inputs.image_tag }} --project=${{ inputs.project_path }} --contract=${{ inputs.contract_name }} --output=/home/runner/work/output-from-docker --package-whole-project-src=${{ inputs.package_whole_project_src }} + flag_package_whole_project_src="" + if ${{ inputs.package_whole_project_src }}; then + flag_package_whole_project_src="--package-whole-project-src" + fi + python3 ./build_with_docker.py --no-docker-tty --image=multiversx/sdk-rust-contract-builder:${{ inputs.image_tag }} --project=${{ inputs.project_path }} --contract=${{ inputs.contract_name }} --output=/home/runner/work/output-from-docker ${flag_package_whole_project_src} - name: Save artifacts uses: actions/upload-artifact@v3 From c1e07711ffeda699c5e4ea205adb624d0ab7184c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= Date: Wed, 27 Dec 2023 18:48:03 +0200 Subject: [PATCH 5/5] Add empty line. --- .github/workflows/reproducible-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/reproducible-build.yml b/.github/workflows/reproducible-build.yml index bed24c1..49e6031 100644 --- a/.github/workflows/reproducible-build.yml +++ b/.github/workflows/reproducible-build.yml @@ -127,6 +127,7 @@ jobs: if ${{ inputs.package_whole_project_src }}; then flag_package_whole_project_src="--package-whole-project-src" fi + python3 ./build_with_docker.py --no-docker-tty --image=multiversx/sdk-rust-contract-builder:${{ inputs.image_tag }} --project=${{ inputs.project_path }} --contract=${{ inputs.contract_name }} --output=/home/runner/work/output-from-docker ${flag_package_whole_project_src} - name: Save artifacts