Skip to content

Commit d1a082b

Browse files
ar2rsawseenar2rsawseen
authored
Merge branch 'master' into ar2rsawseen/master2
2 parents 90a1daf + f772bcd commit d1a082b

File tree

240 files changed

+11654
-7697
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

240 files changed

+11654
-7697
lines changed

‎.github/dependabot.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,6 @@ updates:
174174
- dependencies
175175
versioning-strategy: increase-if-necessary
176176

177-
- package-ecosystem: npm
178-
directory: "/plugins/enterpriseinfo"
179-
schedule:
180-
interval: daily
181-
open-pull-requests-limit: 10
182-
labels:
183-
- dependencies
184-
versioning-strategy: increase-if-necessary
185-
186177
- package-ecosystem: npm
187178
directory: "/plugins/errorlogs"
188179
schedule:

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
steps:
3939
- name: Checkout repository
40-
uses: actions/checkout@v4
40+
uses: actions/checkout@v5
4141

4242
# Initializes the CodeQL tools for scanning.
4343
- name: Initialize CodeQL

‎.github/workflows/deploy.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v5
2323

2424
- name: Enable command line
2525
shell: bash
@@ -45,10 +45,10 @@ jobs:
4545
runs-on: ubuntu-latest
4646
steps:
4747
- name: Check out the repo
48-
uses: actions/checkout@v4
48+
uses: actions/checkout@v5
4949

5050
- name: Log in to Docker Hub
51-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
51+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef
5252
with:
5353
username: ${{ secrets.DOCKERHUB_USERNAME }}
5454
password: ${{ secrets.DOCKERHUB_TOKEN }}

‎.github/workflows/docker-image.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Check out the repo
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v5
1616

1717
- name: Set output
1818
id: vars
@@ -26,7 +26,7 @@ jobs:
2626
echo ${{ steps.vars.outputs.tag }}
2727
2828
- name: Log in to Docker Hub
29-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
29+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef
3030
with:
3131
username: ${{ secrets.DOCKERHUB_USERNAME }}
3232
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -43,7 +43,7 @@ jobs:
4343
runs-on: ubuntu-latest
4444
steps:
4545
- name: Check out the repo
46-
uses: actions/checkout@v4
46+
uses: actions/checkout@v5
4747

4848
- name: Set output
4949
id: vars
@@ -57,7 +57,7 @@ jobs:
5757
echo ${{ steps.vars.outputs.tag }}
5858
5959
- name: Log in to Docker Hub
60-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
60+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef
6161
with:
6262
username: ${{ secrets.DOCKERHUB_USERNAME }}
6363
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -74,7 +74,7 @@ jobs:
7474
runs-on: ubuntu-latest
7575
steps:
7676
- name: Check out the repo
77-
uses: actions/checkout@v4
77+
uses: actions/checkout@v5
7878

7979
- name: Set output
8080
id: vars
@@ -88,7 +88,7 @@ jobs:
8888
echo ${{ steps.vars.outputs.tag }}
8989
9090
- name: Log in to Docker Hub
91-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
91+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef
9292
with:
9393
username: ${{ secrets.DOCKERHUB_USERNAME }}
9494
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -105,7 +105,7 @@ jobs:
105105
runs-on: ubuntu-latest
106106
steps:
107107
- name: Check out the repo
108-
uses: actions/checkout@v4
108+
uses: actions/checkout@v5
109109

110110
- name: Set output
111111
id: vars
@@ -119,7 +119,7 @@ jobs:
119119
echo ${{ steps.vars.outputs.tag }}
120120
121121
- name: Log in to Docker Hub
122-
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
122+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef
123123
with:
124124
username: ${{ secrets.DOCKERHUB_USERNAME }}
125125
password: ${{ secrets.DOCKERHUB_TOKEN }}

‎.github/workflows/main.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
# Steps represent a sequence of tasks that will be executed as part of the job
2727
steps:
2828
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
29-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@v5
3030

3131
- name: Copy code
3232
shell: bash
@@ -96,7 +96,7 @@ jobs:
9696
COUNTLY_CONFIG_API_PREVENT_JOBS: true
9797

9898
steps:
99-
- uses: actions/checkout@v4
99+
- uses: actions/checkout@v5
100100

101101
- name: Copy code
102102
shell: bash
@@ -153,7 +153,7 @@ jobs:
153153
COUNTLY_CONFIG_API_PREVENT_JOBS: true
154154

155155
steps:
156-
- uses: actions/checkout@v4
156+
- uses: actions/checkout@v5
157157

158158
- name: Prepare tests
159159
shell: bash
@@ -205,7 +205,7 @@ jobs:
205205
COUNTLY_CONFIG_API_PREVENT_JOBS: true
206206

207207
steps:
208-
- uses: actions/checkout@v4
208+
- uses: actions/checkout@v5
209209

210210
- name: Copy code
211211
shell: bash
@@ -268,7 +268,7 @@ jobs:
268268
COUNTLY_CONFIG_API_PREVENT_JOBS: true
269269

270270
steps:
271-
- uses: actions/checkout@v4
271+
- uses: actions/checkout@v5
272272

273273
- name: Install Chrome
274274
shell: bash

‎.github/workflows/release_notice.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ jobs:
1414
run: echo "$GITHUB_CONTEXT"
1515
- name: Send custom JSON data to Slack workflow
1616
id: slack
17-
uses: slackapi/[email protected].0
17+
uses: slackapi/[email protected].1
1818
with:
1919
# This data can be any valid JSON from a previous step in the GitHub Action
20+
webhook: ${{ secrets.SLACK_RELEASE }}
21+
webhook-type: incoming-webhook
2022
payload: |
2123
{
2224
"repository": "${{ github.repository }}",
@@ -28,7 +30,7 @@ jobs:
2830
env:
2931
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_RELEASE }}
3032
- name: Send custom JSON data to Discord
31-
uses: sarisia/[email protected].3
33+
uses: sarisia/[email protected].4
3234
with:
3335
webhook: ${{ secrets.DISCORD_WEBHOOK_URL }}
3436
nodetail: true

‎.github/workflows/stable-je-deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v5
2323

2424
- name: Deploy server
2525
shell: bash

0 commit comments

Comments
 (0)