From 29bc0b67bae1598cae1fa5202dae3999c7c05f69 Mon Sep 17 00:00:00 2001 From: Clement Tsang <34804052+ClementTsang@users.noreply.github.com> Date: Sun, 6 Nov 2022 03:19:52 -0500 Subject: [PATCH] ci: rename deployment folder to scripts (#873) --- .github/workflows/build_releases.yml | 2 +- .github/workflows/deployment.yml | 2 +- Cargo.toml | 2 +- {deployment => scripts}/cirrus/build.py | 0 {deployment => scripts}/packager.py | 0 {deployment => scripts}/windows/choco/bottom.nuspec.template | 0 {deployment => scripts}/windows/choco/choco_packager.py | 0 .../windows/choco/chocolateyinstall.ps1.template | 0 8 files changed, 3 insertions(+), 3 deletions(-) rename {deployment => scripts}/cirrus/build.py (100%) rename {deployment => scripts}/packager.py (100%) rename {deployment => scripts}/windows/choco/bottom.nuspec.template (100%) rename {deployment => scripts}/windows/choco/choco_packager.py (100%) rename {deployment => scripts}/windows/choco/chocolateyinstall.ps1.template (100%) diff --git a/.github/workflows/build_releases.yml b/.github/workflows/build_releases.yml index 4492bee8..a7d536a4 100644 --- a/.github/workflows/build_releases.yml +++ b/.github/workflows/build_releases.yml @@ -259,7 +259,7 @@ jobs: env: CIRRUS_KEY: ${{ secrets.CIRRUS_TOKEN }} run: | - python ./deployment/cirrus/build.py "${{ github.ref_name }}" "release/" "${{ inputs.caller }}" + python ./scripts/cirrus/build.py "${{ github.ref_name }}" "release/" "${{ inputs.caller }}" - name: Save release as artifact uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0 diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 53d94ff9..e353dbfd 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -88,7 +88,7 @@ jobs: - name: Execute choco packaging script run: | - python "./deployment/windows/choco/choco_packager.py" "./release/bottom_x86_64-pc-windows-msvc.zip" ${{ env.RELEASE_VERSION }} "./deployment/windows/choco/bottom.nuspec.template" "./deployment/windows/choco/chocolateyinstall.ps1.template" "bottom.nuspec" "tools/chocolateyinstall.ps1" "tools/" + python "./scripts/windows/choco/choco_packager.py" "./release/bottom_x86_64-pc-windows-msvc.zip" ${{ env.RELEASE_VERSION }} "./scripts/windows/choco/bottom.nuspec.template" "./scripts/windows/choco/chocolateyinstall.ps1.template" "bottom.nuspec" "tools/chocolateyinstall.ps1" "tools/" zip -r choco.zip "bottom.nuspec" "tools" - name: Move release file into release directory diff --git a/Cargo.toml b/Cargo.toml index c2d5d828..6d0d7213 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ exclude = [ ".cargo-husky/", ".github/", "assets/", - "deployment/", + "scripts/", "docs/", "sample_configs/", ".all-contributorsrc", diff --git a/deployment/cirrus/build.py b/scripts/cirrus/build.py similarity index 100% rename from deployment/cirrus/build.py rename to scripts/cirrus/build.py diff --git a/deployment/packager.py b/scripts/packager.py similarity index 100% rename from deployment/packager.py rename to scripts/packager.py diff --git a/deployment/windows/choco/bottom.nuspec.template b/scripts/windows/choco/bottom.nuspec.template similarity index 100% rename from deployment/windows/choco/bottom.nuspec.template rename to scripts/windows/choco/bottom.nuspec.template diff --git a/deployment/windows/choco/choco_packager.py b/scripts/windows/choco/choco_packager.py similarity index 100% rename from deployment/windows/choco/choco_packager.py rename to scripts/windows/choco/choco_packager.py diff --git a/deployment/windows/choco/chocolateyinstall.ps1.template b/scripts/windows/choco/chocolateyinstall.ps1.template similarity index 100% rename from deployment/windows/choco/chocolateyinstall.ps1.template rename to scripts/windows/choco/chocolateyinstall.ps1.template