Skip to content

Commit 318eb9c

Browse files
Merge branch 'main' into 246-remove-binarydirectorypath-from-cisetupjs
2 parents f05e624 + b37a8b3 commit 318eb9c

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ jobs:
3737
with:
3838
name: ci-mysqlmsn-dir
3939
path: /tmp/mysqlmsn
40-
compression-level: 0
40+
compression-level: 9

.github/workflows/os-compatibility.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ jobs:
4747
with:
4848
name: ${{ matrix.os }}-${{ matrix.version-requirement }}
4949
path: "C:\\Users\\RUNNER~1\\mysqlmsn"
50-
compression-level: 0
50+
compression-level: 9
5151

5252
- name: Upload mysqlmsn directory (Not Windows)
5353
if: ${{ failure() && runner.os != 'Windows' }}
5454
uses: actions/[email protected]
5555
with:
5656
name: ${{ matrix.os }}-${{ matrix.version-requirement }}
5757
path: /tmp/mysqlmsn
58-
compression-level: 0
58+
compression-level: 9
5959

6060
fedora-docker:
6161
runs-on: ubuntu-${{ matrix.ubuntu-version}}
@@ -100,7 +100,7 @@ jobs:
100100
with:
101101
name: docker-fedora-${{ matrix.version }}-${{ matrix.version-requirement }}-${{ matrix.ubuntu-version}}
102102
path: /tmp/mysqlmsn
103-
compression-level: 0
103+
compression-level: 9
104104

105105
alpine-docker:
106106
runs-on: ubuntu-${{ matrix.ubuntu-version}}

tests/ci/DirMoveGitHubActions.ts

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@ import os from 'os';
22
import fs from 'fs';
33
import fsPromises from 'fs/promises'
44

5-
const originalPath = `${os.tmpdir()}/mysqlmsn`
6-
if (process.env.MOVE_MYSQLMSN_TO && fs.existsSync(originalPath) && originalPath !== process.env.MOVE_MYSQLMSN_TO) {
7-
console.log('Moving MySQLMSN directory to other path for GitHub Actions upload')
8-
await fsPromises.cp(originalPath, process.env.MOVE_MYSQLMSN_TO, {recursive: true, force: true, filter: source => !source.includes('.sock')})
9-
await fsPromises.rm(originalPath, {force: true, recursive: true, maxRetries: 50, retryDelay: 100})
10-
} else {
11-
console.log('Skipping MySQLMSN directory move as conditions are not met.')
12-
}
5+
async function main() {
6+
const originalPath = `${os.tmpdir()}/mysqlmsn`
7+
if (process.env.MOVE_MYSQLMSN_TO && fs.existsSync(originalPath) && originalPath !== process.env.MOVE_MYSQLMSN_TO) {
8+
console.log('Moving MySQLMSN directory to other path for GitHub Actions upload')
9+
await fsPromises.cp(originalPath, process.env.MOVE_MYSQLMSN_TO, {recursive: true, force: true, filter: source => !source.includes('.sock')})
10+
await fsPromises.rm(originalPath, {force: true, recursive: true, maxRetries: 50, retryDelay: 100})
11+
} else {
12+
console.log('Skipping MySQLMSN directory move as conditions are not met.')
13+
}
14+
}
15+
16+
main()

0 commit comments

Comments
 (0)