Skip to content

Commit

Permalink
do not force editor settings overwrite (#42)
Browse files Browse the repository at this point in the history
Co-authored-by: firebelley <firebelley@users.noreply.github.com>
  • Loading branch information
firebelley and firebelley authored Nov 22, 2020
1 parent f97313d commit 2c1be53
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
fetch-depth: 0
- name: export game
# Use latest version (see releases for all versions)
uses: firebelley/godot-export@v2.6.0
uses: firebelley/godot-export@v2.6.1
with:
# Defining all the required inputs
# I used the mono version of Godot in this example
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
echo ::set-output name=TAG_VERSION::${GITHUB_REF#refs/tags/v}
- name: export game
# Use latest version (see releases for all versions)
uses: firebelley/godot-export@v2.6.0
uses: firebelley/godot-export@v2.6.1
with:
# Defining all the required inputs
# I used the mono version of Godot in this example
Expand All @@ -150,3 +150,6 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
```
### Using custom editor settings
Some Godot configurations are editor-based and not project-based. This includes things like Android paths. This repository provides a [base editor settings](./dist/editor_settings-3.tres) that will be used by default when exporting your games. However, you can supply a custom editor settings configuration by simply copying a a custom editor settings file to `~/.config/godot/editor_settings-3.tres` _before_ this action runs. This action will not overwrite an existing `editor_settings-3.tres` file.
2 changes: 1 addition & 1 deletion dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13091,7 +13091,7 @@ async function addEditorSettings() {
const editorSettingsDist = Object(external_path_.join)(__dirname, editorSettings);
await Object(io.mkdirP)(GODOT_CONFIG_PATH);
const editorSettingsPath = Object(external_path_.join)(GODOT_CONFIG_PATH, editorSettings);
await Object(io.cp)(editorSettingsDist, editorSettingsPath);
await Object(io.cp)(editorSettingsDist, editorSettingsPath, { force: false });
Object(core.info)(`Wrote editor settings to ${editorSettingsPath}`);
}
function writeIconSettings() {
Expand Down
2 changes: 1 addition & 1 deletion src/godot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ async function addEditorSettings(): Promise<void> {
await io.mkdirP(GODOT_CONFIG_PATH);

const editorSettingsPath = path.join(GODOT_CONFIG_PATH, editorSettings);
await io.cp(editorSettingsDist, editorSettingsPath);
await io.cp(editorSettingsDist, editorSettingsPath, { force: false });
core.info(`Wrote editor settings to ${editorSettingsPath}`);
}

Expand Down

0 comments on commit 2c1be53

Please sign in to comment.