From 997b6725fea73f1baab97abe3e88ed8e9f17e755 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Tue, 26 Apr 2022 22:07:54 -0700 Subject: [PATCH] chore: rename building path to dev --- .github/workflows/CI.yml | 2 +- README.md | 6 +++--- {building => dev}/docker/ubuntu.dockerfile | 0 {building => dev}/docker/ubuntu_node.dockerfile | 0 {building => dev}/docker/ubuntu_stable_node.dockerfile | 0 {building => dev}/scripts/debug_remove.js | 0 {building => dev}/scripts/pack-exe.js | 0 package.json | 4 ++-- 8 files changed, 6 insertions(+), 6 deletions(-) rename {building => dev}/docker/ubuntu.dockerfile (100%) rename {building => dev}/docker/ubuntu_node.dockerfile (100%) rename {building => dev}/docker/ubuntu_stable_node.dockerfile (100%) rename {building => dev}/scripts/debug_remove.js (100%) rename {building => dev}/scripts/pack-exe.js (100%) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b3cd0b4d..89bb57fc 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -127,6 +127,6 @@ jobs: - name: Build id: docker_build run: | - docker build -f ./building/docker/${{ matrix.container }} -t setup_cpp . + docker build -f ./dev/docker/${{ matrix.container }} -t setup_cpp . env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true diff --git a/README.md b/README.md index 9c97ee27..b4909739 100644 --- a/README.md +++ b/README.md @@ -197,12 +197,12 @@ RUN source ~/.cpprc ENTRYPOINT [ "/bin/sh" ] ``` -See [this folder](https://github.com/aminya/setup-cpp/tree/master/building/docker), for some dockerfile examples. +See [this folder](https://github.com/aminya/setup-cpp/tree/master/dev/docker), for some dockerfile examples. If you want to build the ones included, then run: ```ps1 -docker build -f ./building/docker/ubuntu.dockerfile -t setup_cpp . +docker build -f ./dev/docker/ubuntu.dockerfile -t setup_cpp . ``` Where you should use the path to the dockerfile after `-f`. @@ -230,7 +230,7 @@ jobs: - name: Build id: docker_build run: | - docker build -f ./building/docker/debian.dockerfile -t setup_cpp . + docker build -f ./dev/docker/debian.dockerfile -t setup_cpp . env: ACTIONS_ALLOW_UNSECURE_COMMANDS: true ``` diff --git a/building/docker/ubuntu.dockerfile b/dev/docker/ubuntu.dockerfile similarity index 100% rename from building/docker/ubuntu.dockerfile rename to dev/docker/ubuntu.dockerfile diff --git a/building/docker/ubuntu_node.dockerfile b/dev/docker/ubuntu_node.dockerfile similarity index 100% rename from building/docker/ubuntu_node.dockerfile rename to dev/docker/ubuntu_node.dockerfile diff --git a/building/docker/ubuntu_stable_node.dockerfile b/dev/docker/ubuntu_stable_node.dockerfile similarity index 100% rename from building/docker/ubuntu_stable_node.dockerfile rename to dev/docker/ubuntu_stable_node.dockerfile diff --git a/building/scripts/debug_remove.js b/dev/scripts/debug_remove.js similarity index 100% rename from building/scripts/debug_remove.js rename to dev/scripts/debug_remove.js diff --git a/building/scripts/pack-exe.js b/dev/scripts/pack-exe.js similarity index 100% rename from building/scripts/pack-exe.js rename to dev/scripts/pack-exe.js diff --git a/package.json b/package.json index e326a34a..a026608e 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ }, "scripts": { "build": "run-p test.tsc build.parcel copy.matchers", - "build.docker": "pnpm build && docker build -f ./building/docker/ubuntu_node.dockerfile -t setup_cpp .", + "build.docker": "pnpm build && docker build -f ./dev/docker/ubuntu_node.dockerfile -t setup_cpp .", "build.parcel": "shx rm -rf ./dist/*.js ./dist/*.js.map && cross-env NODE_ENV=production parcel build --detailed-report", "bump": "ncu -u -x execa && pnpm update", "clean": "shx rm -rf .parcel-cache dist exe", @@ -21,7 +21,7 @@ "dev": "cross-env NODE_ENV=development parcel watch", "format": "prettier --write .", "lint": "eslint . --fix", - "pack.exe": "shx rm -rf ./dist/tsconfig.tsbuildinfo && node ./building/scripts/pack-exe.js", + "pack.exe": "shx rm -rf ./dist/tsconfig.tsbuildinfo && node ./dev/scripts/pack-exe.js", "prepare": "npm run build", "start.docker": "docker run -t setup_cpp .", "test": "run-p test.format test.lint test.cspell test.tsc test.unit",