Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into MP1-5183-TVE_x64_ve…
Browse files Browse the repository at this point in the history
…rsion
  • Loading branch information
epbk committed Dec 11, 2023
2 parents 6a45e71 + 02613ec commit 1078390
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/mediaportal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ jobs:
shell: cmd

- name: Setup Java JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 8
architecture: x86
distribution: temurin

- name: Setup NSIS
run: |
choco install --yes nsis --version=3.08
choco install --yes nsis --version=3.08 --force
- name: Git Checkout
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mediaportal_jira.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ jobs:
shell: cmd

- name: Setup Java JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 8
architecture: x86
distribution: temurin

- name: Setup NSIS
run: |
choco install --yes nsis --version=3.08
choco install --yes nsis --version=3.08 --force
- name: Git Checkout
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mediaportal_test_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ jobs:
shell: cmd

- name: Setup Java JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 8
architecture: x86
distribution: temurin

- name: Setup NSIS
run: |
choco install --yes nsis --version=3.08
choco install --yes nsis --version=3.08 --force
- name: Git Checkout
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/workflow_codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ jobs:
shell: cmd

- name: Setup Java JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 8
architecture: x86
distribution: temurin

- name: Setup NSIS
run: |
choco install --yes nsis --version=3.08
choco install --yes nsis --version=3.08 --force
- name: Git Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow_size_labels.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Workflow / Size and Stability labels

on:
pull_request:
pull_request_target:
types: [opened, synchronize]
# push:
# branches: [master]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow_stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
# - No PRs marked as no-stale
# - No issues (-1)
- name: 90 days stale PRs policy
uses: actions/stale@v8
uses: actions/stale@v9
with:
days-before-stale: 90
days-before-close: 7
Expand Down

0 comments on commit 1078390

Please sign in to comment.