Commit f06a00e

committed

Merge remote-tracking branch 'origin/main'

2 parents dd2ff32 + b6c9224 commit f06a00eCopy full SHA for f06a00e

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,10 @@ on:`
`9`	`9`	`- '*/.lock'`
`10`	`10`	`- '.github/workflows/devRun.yml'`
`11`	`11`
	`12`	`+permissions:`
	`13`	`+ contents: write`
	`14`	`+ pages: write`
	`15`	`+`
`12`	`16`	`jobs:`
`13`	`17`	`merge_test:`
`14`	`18`	`timeout-minutes: 15`
`@@ -60,7 +64,7 @@ jobs:`
`60`	`64`	`echo CHROME_VERSION=$(google-chrome --product-version)`
`61`	`65`	`} >> environment.properties`
`62`	`66`	`- name: Generate Allure Report`
`63`		`- uses: simple-elf/allure-report-action@master`
	`67`	`+ uses: simple-elf/allure-report-action@v1.12`
`64`	`68`	`if: always()`
`65`	`69`	`id: allure-report`
`66`	`70`	`with:`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,10 @@ on:`
`16`	`16`	`default: 2`
`17`	`17`	`type: number`
`18`	`18`
	`19`	`+permissions:`
	`20`	`+ contents: write`
	`21`	`+ pages: write`
	`22`	`+`
`19`	`23`	`jobs:`
`20`	`24`	`setup-matrix:`
`21`	`25`	`runs-on: ubuntu-latest`
`@@ -113,7 +117,7 @@ jobs:`
`113`	`117`	`if: contains(needs.*.result, 'failure')`
`114`	`118`	`run: echo ARTIFACT_URL=${{ steps.merged-artifact-upload.outputs.artifact-url }} >> environment.properties`
`115`	`119`	`- name: Generate Allure Report`
`116`		`- uses: simple-elf/allure-report-action@master`
	`120`	`+ uses: simple-elf/allure-report-action@v1.12`
`117`	`121`	`if: always()`
`118`	`122`	`id: allure-report`
`119`	`123`	`with:`

Comments

(0)