Skip to content

Commit

Permalink
fully revert changes to Taskfile variable deduplication
Browse files Browse the repository at this point in the history
If someone on linux/macOS wanted or needed to change these values, they would have to copy them into the respective file.

It would then be potentially confusing which variable is the source of truth (the OS file wins).

Avoid this unneeded confusion, having the variables copied into the darwin and linux file is not a big deal.
  • Loading branch information
xTVaser committed Nov 25, 2024
1 parent c84a039 commit 7e5cd1d
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 16 deletions.
17 changes: 1 addition & 16 deletions Taskfile.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,7 @@
version: 3

includes:
build:
taskfile: ./scripts/tasks/Taskfile_{{OS}}.yml
optional: true

# Default vars for Linux/Mac/Unix
vars:
GOALC_BIN_RELEASE_DIR: './build/goalc'
GK_BIN_RELEASE_DIR: './build/game'
DECOMP_BIN_RELEASE_DIR: './build/decompiler'
MEMDUMP_BIN_RELEASE_DIR: './build/tools'
TYPESEARCH_BIN_RELEASE_DIR: './build/tools'
OFFLINETEST_BIN_RELEASE_DIR: './build'
GOALCTEST_BIN_RELEASE_DIR: './build'
FORMATTER_BIN_RELEASE_DIR: './build/tools'
EXE_FILE_EXTENSION: ''
PYTHON: 'python3'
build: ./scripts/tasks/Taskfile_{{OS}}.yml

dotenv:
- ./scripts/tasks/.env
Expand Down
10 changes: 10 additions & 0 deletions scripts/tasks/Taskfile_darwin.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
version: 3

vars:
GOALC_BIN_RELEASE_DIR: './build/goalc'
GK_BIN_RELEASE_DIR: './build/game'
DECOMP_BIN_RELEASE_DIR: './build/decompiler'
MEMDUMP_BIN_RELEASE_DIR: './build/tools'
TYPESEARCH_BIN_RELEASE_DIR: './build/tools'
OFFLINETEST_BIN_RELEASE_DIR: './build'
GOALCTEST_BIN_RELEASE_DIR: './build'
FORMATTER_BIN_RELEASE_DIR: './build/tools'
EXE_FILE_EXTENSION: ''
PYTHON: 'python3'
10 changes: 10 additions & 0 deletions scripts/tasks/Taskfile_linux.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
version: 3

vars:
GOALC_BIN_RELEASE_DIR: './build/goalc'
GK_BIN_RELEASE_DIR: './build/game'
DECOMP_BIN_RELEASE_DIR: './build/decompiler'
MEMDUMP_BIN_RELEASE_DIR: './build/tools'
TYPESEARCH_BIN_RELEASE_DIR: './build/tools'
OFFLINETEST_BIN_RELEASE_DIR: './build'
GOALCTEST_BIN_RELEASE_DIR: './build'
FORMATTER_BIN_RELEASE_DIR: './build/tools'
EXE_FILE_EXTENSION: ''
PYTHON: 'python3'

0 comments on commit 7e5cd1d

Please sign in to comment.