Skip to content

Commit e860c4e

Browse files
authored
Move scripts into actions directories (#250)
Move scripts into actions directories This commit moves scripts that drive Github Actions into the related actions sub directory as the top-level "scripts" folder appears to be somewhat detached.
1 parent 07541c9 commit e860c4e

16 files changed

Lines changed: 13 additions & 16 deletions

actions/run-syntax-tests/action.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ runs:
1414
PACKAGE_FROM_INPUTS="${{ inputs.package-name }}"
1515
PACKAGE="${PACKAGE_FROM_INPUTS:-$PACKAGE}"
1616
17-
python3 "$GITHUB_ACTION_PATH/../../scripts/run_tests.py" "$PACKAGE" --syntax-test
17+
python3 "$GITHUB_ACTION_PATH/../run-tests/run_tests.py" "$PACKAGE" --syntax-test
1818
1919
if [ "${{ inputs.compatibility }}" == "true" ]; then
20-
python3 "$GITHUB_ACTION_PATH/../../scripts/run_tests.py" "$PACKAGE" --syntax-compatibility
20+
python3 "$GITHUB_ACTION_PATH/../run-tests/run_tests.py" "$PACKAGE" --syntax-compatibility
2121
fi
2222
shell: bash

actions/run-tests/action.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ runs:
2020
PACKAGE="${PACKAGE_FROM_INPUTS:-$PACKAGE}"
2121
2222
if [ "${{ inputs.coverage }}" == "true" ]; then
23-
python "$GITHUB_ACTION_PATH/../../scripts/run_tests.py" "$PACKAGE" --coverage
23+
python "$GITHUB_ACTION_PATH/run_tests.py" "$PACKAGE" --coverage
2424
else
25-
python "$GITHUB_ACTION_PATH/../../scripts/run_tests.py" "$PACKAGE"
25+
python "$GITHUB_ACTION_PATH/run_tests.py" "$PACKAGE"
2626
fi
2727
shell: bash
2828
- if: inputs.codecov-upload == 'true'
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
PACKAGES_DIR_PATH = os.path.realpath(
2323
os.environ.get(
24-
"SUBLIME_TEXT_PACKAGES", os.path.join(os.path.dirname(__file__), "..", "..")
24+
"SUBLIME_TEXT_PACKAGES", os.path.join(os.path.dirname(__file__), "..", "..", "..")
2525
)
2626
)
2727
UT_OUTPUT_DIR_PATH = os.path.realpath(

actions/setup/action.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ runs:
9393
shell: bash
9494
- if: runner.os == 'Linux'
9595
run: |
96-
sudo bash $GITHUB_ACTION_PATH/../../scripts/install_ubuntu_sys_req.sh
96+
sudo bash $GITHUB_ACTION_PATH/install_ubuntu_sys_req.sh
9797
echo "DISPLAY=:1" >> $GITHUB_ENV
9898
9999
if [ "${{ inputs.display }}" = "xvfb" ]; then
@@ -140,19 +140,19 @@ runs:
140140
shell: bash
141141
- if: runner.os == 'Linux' || runner.os == 'macOS'
142142
run: |
143-
bash $GITHUB_ACTION_PATH/../../scripts/install_sublime_text.sh
143+
bash $GITHUB_ACTION_PATH/install_sublime_text.sh
144144
shell: bash
145145
- if: runner.os == 'Windows'
146146
run: |
147-
pwsh $Env:GITHUB_ACTION_PATH/../../scripts/install_sublime_text.ps1 --verbose
147+
pwsh $Env:GITHUB_ACTION_PATH/install_sublime_text.ps1 --verbose
148148
shell: pwsh
149149
- run: |
150150
# Disable warnings about detached HEAD
151151
# https://stackoverflow.com/questions/36794501
152152
git config --global advice.detachedHead false
153153
154154
# block sublime text website ip
155-
bash $GITHUB_ACTION_PATH/../../scripts/block_ip.sh
155+
bash $GITHUB_ACTION_PATH/block_ip.sh
156156
shell: bash
157157
- run: |
158158
REPO="$GITHUB_REPOSITORY"
@@ -171,7 +171,7 @@ runs:
171171
echo "PACKAGE=$PACKAGE" >> $GITHUB_ENV
172172
shell: bash
173173
- run: |
174-
. $GITHUB_ACTION_PATH/../../scripts/utils.sh
174+
. $GITHUB_ACTION_PATH/utils.sh
175175
176176
# Copy plugin files to Packages/<Package> folder if files are checked out.
177177
if [ "${{ inputs.install-package }}" = "true" ]; then
@@ -209,11 +209,11 @@ runs:
209209
shell: bash
210210
- if: (runner.os == 'Linux' || runner.os == 'macOS') && inputs.install-package-control == 'true'
211211
run: |
212-
bash $GITHUB_ACTION_PATH/../../scripts/install_package_control.sh
212+
bash $GITHUB_ACTION_PATH/install_package_control.sh
213213
shell: bash
214214
- if: runner.os == 'Windows' && inputs.install-package-control == 'true'
215215
run: |
216-
pwsh $Env:GITHUB_ACTION_PATH/../../scripts/install_package_control.ps1 --verbose
216+
pwsh $Env:GITHUB_ACTION_PATH/install_package_control.ps1 --verbose
217217
shell: pwsh
218218
- run: |
219219
if [ "${{ inputs.install-package }}" = "true" ]; then
File renamed without changes.

0 commit comments

Comments
 (0)