Skip to content

Commit 4bb8df2

Browse files
authored
Merge branch 'mage-os:main' into chore/update-dependency-versions
2 parents 75f2f03 + 404e77a commit 4bb8df2

File tree

16 files changed

+2242
-6626
lines changed

16 files changed

+2242
-6626
lines changed

.github/workflows/_internal-setup-magento.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
php-version: ${{ matrix.php }}
5858
tools: composer:v${{ matrix.composer }}
5959

60-
- uses: actions/cache@v3
60+
- uses: actions/cache@v4
6161
id: setup-magento-store-cache
6262
with:
6363
key: setup-magento-ci | ${{ runner.os }} | ${{ matrix.magento }}

.github/workflows/full-integration-tests.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
testsuite_dirs: ${{ steps.set-matrix-testsuite.outputs.testsuite_dirs }}
3636
steps:
3737
- name: Checkout commit
38-
uses: actions/checkout@v3
38+
uses: actions/checkout@v4
3939
with:
4040
repository: ${{ github.event.inputs.repository }}
4141
ref: ${{ github.event.inputs.head }}
@@ -181,7 +181,7 @@ jobs:
181181
runs-on: ubuntu-latest
182182
steps:
183183
- name: Checkout commit
184-
uses: actions/checkout@v3
184+
uses: actions/checkout@v4
185185
with:
186186
repository: ${{ github.event.inputs.repository }}
187187
ref: ${{ github.event.inputs.head }}
@@ -259,7 +259,7 @@ jobs:
259259
runs-on: ubuntu-latest
260260
steps:
261261
- name: Checkout commit
262-
uses: actions/checkout@v3
262+
uses: actions/checkout@v4
263263
with:
264264
repository: ${{ github.event.inputs.repository }}
265265
ref: ${{ github.event.inputs.head }}

.github/workflows/integration.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
131131
132132
- name: "Cache Composer Packages"
133-
uses: actions/cache@v3
133+
uses: actions/cache@v4
134134
with:
135135
key: "composer | v5 | ${{ inputs.composer_cache_key }} | ${{ hashFiles('composer.lock') }} | ${{ matrix.os }} | ${{ matrix.composer }} | ${{ matrix.php }} | ${{ matrix.magento }}"
136136
path: ${{ steps.composer-cache.outputs.dir }}
@@ -210,7 +210,7 @@ jobs:
210210
name: Run Integration Tests
211211

212212
- name: Upload test sandbox dir
213-
uses: actions/upload-artifact@v3
213+
uses: actions/upload-artifact@v4
214214
if: failure()
215215
with:
216216
name: sandbox-data-${{ steps.magento-version.outputs.version }}

.github/workflows/nx-integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
runs-on: ubuntu-latest
109109
steps:
110110
- name: Project Cache
111-
uses: actions/cache/restore@v3
111+
uses: actions/cache/restore@v4
112112
with:
113113
path: main
114114
key: ${{ runner.os }}-project-${{ inputs.ref }}

.github/workflows/release-please.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
release-please:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: google-github-actions/release-please-action@v3
12+
- uses: google-github-actions/release-please-action@v4
1313
with:
1414
token: ${{ secrets.MAGE_OS_CI_TOKEN }}
1515
command: manifest
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Sansec eComscan Security Scan
2+
3+
on:
4+
push:
5+
pull_request_target:
6+
workflow_dispatch:
7+
8+
jobs:
9+
run-ecomscan:
10+
# Skip if it's a push event on a PR (it can't access secrets)
11+
if: github.event.pull_request == null || github.event_name != 'push'
12+
name: Run Sansec eComscan
13+
runs-on: ubuntu-latest
14+
permissions:
15+
contents: read
16+
pull-requests: read
17+
18+
steps:
19+
- name: Checkout repository
20+
uses: actions/checkout@v4
21+
with:
22+
ref: ${{ github.event.pull_request.head.sha }}
23+
persist-credentials: false
24+
25+
- name: Download eComscan
26+
run: wget https://ecomscan.com/downloads/linux-amd64/ecomscan
27+
28+
- name: Fix permissions
29+
run: chmod +x ecomscan
30+
31+
- name: Run eComscan
32+
env:
33+
ECOMSCAN_KEY: ${{ secrets.SANSEC_LICENSE_KEY }}
34+
run: |
35+
output=$(./ecomscan --no-auto-update --skip-database --deep --format=csv .)
36+
if [ -n "$output" ]; then
37+
echo "Security issues found:"
38+
echo "$output"
39+
exit 1
40+
fi

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{".":"1.4.0"}
1+
{".":"1.6.0"}

CHANGELOG.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,43 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [1.6.0](https://github.com/mage-os/github-actions/compare/v1.5.0...v1.6.0) (2025-03-07)
6+
7+
8+
### Features
9+
10+
* run setup:di:compile on push ([#116](https://github.com/mage-os/github-actions/issues/116)) ([22aca78](https://github.com/mage-os/github-actions/commit/22aca78cc8c648549b7a139fd2739ac9e8db916d))
11+
12+
## [1.5.0](https://github.com/mage-os/github-actions/compare/v1.4.0...v1.5.0) (2024-12-30)
13+
14+
15+
### Features
16+
17+
* add magento releases 2.4.4-p9, 2.4.5-p8, 2.4.6-p6, and 2.4.7-p1 ([#226](https://github.com/mage-os/github-actions/issues/226)) ([a326271](https://github.com/mage-os/github-actions/commit/a3262710f1f605bf468b6fe70d5f1a5bd47b6bb4))
18+
* add new releases to the version matrix ([#232](https://github.com/mage-os/github-actions/issues/232)) ([b633b21](https://github.com/mage-os/github-actions/commit/b633b2120a2157aa13c3e7dd71b1cdbc0045e5d9))
19+
* add project versions ([#110](https://github.com/mage-os/github-actions/issues/110)) ([f7f0504](https://github.com/mage-os/github-actions/commit/f7f0504691b19689227b4db17d333bca62f80cc0))
20+
* add releases 2.4.4-p6, 2.4.5-p5 and 2.4.6-p3 ([#169](https://github.com/mage-os/github-actions/issues/169)) ([2086708](https://github.com/mage-os/github-actions/commit/2086708ffc708b7685b579027163340a4ddfa44f))
21+
* add support for v2.3.7 on new vms ([#67](https://github.com/mage-os/github-actions/issues/67)) ([2824849](https://github.com/mage-os/github-actions/commit/28248496e0979dff3cb255abbfff84cdebd5697b))
22+
* add upcoming release for mage-os 1.0.2 ([#223](https://github.com/mage-os/github-actions/issues/223)) ([f1b13e8](https://github.com/mage-os/github-actions/commit/f1b13e8984ec13e1a154e737c8494470f88b9a21))
23+
* add upcoming release Mage-OS 1.0.3 to supported-version matrix ([#229](https://github.com/mage-os/github-actions/issues/229)) ([6e50d0d](https://github.com/mage-os/github-actions/commit/6e50d0d8de09da49ce12473b2577a2277e4d701e))
24+
* **coding-standard:** add `ignore_warnings` flag ([#147](https://github.com/mage-os/github-actions/issues/147)) ([4e21b18](https://github.com/mage-os/github-actions/commit/4e21b18ee9187253fc5d172d0ad1439bf304872e))
25+
* **get-composer-version:** create new action ([#145](https://github.com/mage-os/github-actions/issues/145)) ([bc840e1](https://github.com/mage-os/github-actions/commit/bc840e13727b4273aa9c22e4116a05cde58b046d))
26+
* **semver-compare:** add new Github action ([#146](https://github.com/mage-os/github-actions/issues/146)) ([01e4ccb](https://github.com/mage-os/github-actions/commit/01e4ccbc54ebe8996c3f25d777a0b4fdc1288e13))
27+
* **supported-versions:** add release date ([#100](https://github.com/mage-os/github-actions/issues/100)) ([5599a0d](https://github.com/mage-os/github-actions/commit/5599a0d2e790952fbdfbbc23b9a1c92aa26eed35))
28+
29+
30+
### Bug Fixes
31+
32+
* add missing build for 1.4.0 of supported versions ([#64](https://github.com/mage-os/github-actions/issues/64)) ([e48a346](https://github.com/mage-os/github-actions/commit/e48a3463c5054012f748bb64eca2bab51220cdc0))
33+
* coding-standard-baseline: Run baseline test on modified files only (fixes [#227](https://github.com/mage-os/github-actions/issues/227)) ([#228](https://github.com/mage-os/github-actions/issues/228)) ([e29ea44](https://github.com/mage-os/github-actions/commit/e29ea44597d69cf743bc172fd84b8f9f238ff3b6))
34+
* continue to use elasticsearch instead of opensearch for now ([#224](https://github.com/mage-os/github-actions/issues/224)) ([dd47d22](https://github.com/mage-os/github-actions/commit/dd47d22478c7fae917f48261d9a32b0ca04aec3c))
35+
* make es8 run correctly in integration tests ([#66](https://github.com/mage-os/github-actions/issues/66)) ([85d11af](https://github.com/mage-os/github-actions/commit/85d11af76e15b6728c3cd1e4d8fb45289b2b1c8c))
36+
* pass correct repo url for nightly ([#158](https://github.com/mage-os/github-actions/issues/158)) ([b645c23](https://github.com/mage-os/github-actions/commit/b645c2327debb49615e1110064c35732aa1b59f4))
37+
* PHPcs baseline composer conflicts ([bf34ec4](https://github.com/mage-os/github-actions/commit/bf34ec4964e683e47b442f82d1cdb0d74b01de69))
38+
* **supported-versions:** nightly build matrix tag ([#152](https://github.com/mage-os/github-actions/issues/152)) ([7f1821f](https://github.com/mage-os/github-actions/commit/7f1821f6ac3faff2e2384212f33fcfdcc8cf4573))
39+
* switch from tj-actions/changed-files to dorny/paths-filter ([87fe77f](https://github.com/mage-os/github-actions/commit/87fe77f8a8dcf6828317894c4b849c4be041853f))
40+
* use exact version of elasticsearch since there is no 8.11 tag ([#225](https://github.com/mage-os/github-actions/issues/225)) ([b4f27f1](https://github.com/mage-os/github-actions/commit/b4f27f19e5196ba6be3b6007cd3e71a40471aa4f))
41+
542
## [1.4.0](https://github.com/mage-os/github-actions/compare/v1.3.0...v1.4.0) (2023-06-20)
643

744

0 commit comments

Comments
 (0)