Skip to content

Commit 5509eb2

Browse files
authored
Merge branch 'Acode-Foundation:main' into ai-test
2 parents 9a96af4 + ea2ba69 commit 5509eb2

File tree

5 files changed

+16
-4
lines changed

5 files changed

+16
-4
lines changed

.github/workflows/nightly-build.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }}-${{ inputs.is_PR && 'is_PR' || 'not_PR'}}
3535
cancel-in-progress: true
3636

37+
permissions:
38+
contents: read
39+
3740
env:
3841
STORE_FILE_PATH: /tmp/app-debug.keystore
3942
BUILD_JSON_PATH: build.json
@@ -44,7 +47,13 @@
4447
timeout-minutes: 60
4548
runs-on: ubuntu-latest
4649
if: github.repository_owner == 'Acode-Foundation'
47-
50+
51+
permissions:
52+
# contents write is needed to create Nightly Releases.
53+
contents: write
54+
issues: write
55+
pull-requests: write
56+
4857
outputs:
4958
release_output_url: ${{ steps.release.outputs.url }}
5059
updated_version: ${{ steps.update-version.outputs.UPDATED_VERSION}}

.github/workflows/on-demand-preview-releases-PR.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
# - '.github/**'
88
types: [labeled, synchronize]
99

10-
10+
# defined at workflow-level as the workflow, Requires these permissions to function.
1111
permissions:
1212
contents: write
1313
pull-requests: write
@@ -23,7 +23,8 @@ jobs:
2323
job_trigger:
2424
name: Trigger Preview Release (if conditions met)
2525
if: |
26-
(github.repository_owner == 'Acode-Foundation'
26+
github.event.pull_request.draft == false
27+
&& (github.repository_owner == 'Acode-Foundation'
2728
&& (!contains(github.event.pull_request.labels.*.name, 'DO NOT PREVIEW RELEASE')
2829
&& (contains(github.event.pull_request.labels.*.name, 'Bypass check - PREVIEW RELEASE')
2930
|| contains(github.event.pull_request.labels.*.name, 'CI: RUN ON-DEMAND PREVIEW RELEASES')))

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
* Fixed an issue where the info dialog wouldn't appear for non-editor tabs in #1167
204204
* Fixed incorrect file attributes in FTP by @bajrangCoder in #1194
205205
* Fixed the palette not opening when triggered from an existing palette by @bajrangCoder in #1197
206-
* Fixed trigering of infinite scroll on plugin page while searching by @bajrangCoder in #1200
206+
* Fixed triggering of infinite scroll on plugin page while searching by @bajrangCoder in #1200
207207

208208
### Features
209209
* Improved tab view gesture handling to distinguish between scroll and swipe on the plugin page by @bajrangCoder in #1131

_typos.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,4 @@ contaienr = "contaienr"
5050
formate = "formate"
5151
collapsable = "collapsable"
5252
styl = "styl"
53+
shft = "shft"

src/plugins/terminal/scripts/init-alpine.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ export PATH=\$PATH:/bin:/sbin:/usr/bin:/usr/sbin:/usr/share/bin:/usr/share/sbin:
7373
export HOME=/home
7474
export TERM=xterm-256color
7575
export SHELL=\$(command -v bash)
76+
export PIP_BREAK_SYSTEM_PACKAGES=1
7677
7778
if [ -s /etc/acode_motd ]; then
7879
cat /etc/acode_motd

0 commit comments

Comments
 (0)