Merge pull request #46 from qwertycxz/master
Absolute path for `actions-cache-folder`
This commit is contained in:
@@ -22,16 +22,36 @@ jobs:
|
||||
with:
|
||||
xmake-version: ${{ matrix.version }}
|
||||
actions-cache-folder: '.xmake-cache'
|
||||
actions-cache-key: ${{ matrix.version }}
|
||||
actions-cache-key: ${{ matrix.version }}-relative
|
||||
build-cache: true
|
||||
build-cache-key: ${{ matrix.version }}
|
||||
build-cache-key: ${{ matrix.version }}-relative
|
||||
package-cache: true
|
||||
package-cache-key: ${{ matrix.version }}
|
||||
package-cache-key: ${{ matrix.version }}-relative
|
||||
project-path: 'tests/sample'
|
||||
|
||||
- name: Run tests
|
||||
- name: Run tests with relative cache path
|
||||
run: |
|
||||
xmake --version
|
||||
cd tests/sample
|
||||
xmake -y -vD
|
||||
xmake run
|
||||
xmake clean
|
||||
|
||||
- uses: xmake-io/github-action-setup-xmake@master
|
||||
with:
|
||||
xmake-version: ${{ matrix.version }}
|
||||
actions-cache-folder: '${{ runner.temp }}/xmake-cache'
|
||||
actions-cache-key: ${{ matrix.version }}-absolute
|
||||
build-cache: true
|
||||
build-cache-key: ${{ matrix.version }}-absolute
|
||||
package-cache: true
|
||||
package-cache-key: ${{ matrix.version }}-absolute
|
||||
project-path: 'tests/sample'
|
||||
|
||||
- name: Run tests with absolute cache path
|
||||
run: |
|
||||
xmake --version
|
||||
cd tests/sample
|
||||
xmake -y -vD
|
||||
xmake run
|
||||
xmake clean
|
||||
|
||||
Vendored
+40693
-32020
File diff suppressed because one or more lines are too long
+2
-2
@@ -37,7 +37,7 @@ export async function unixInstall(version: Version): Promise<void> {
|
||||
const cacheKey = `xmake-cache-${actionsCacheKey}-${ver}-${sha}-${platformIdentifier}`;
|
||||
|
||||
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
||||
const fullCachePath = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
const fullCachePath = path.resolve(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
try {
|
||||
try {
|
||||
fs.accessSync(path.join(fullCachePath, 'bin', 'xmake'), fs.constants.X_OK);
|
||||
@@ -65,7 +65,7 @@ export async function unixInstall(version: Version): Promise<void> {
|
||||
let cacheDir = '';
|
||||
|
||||
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
||||
cacheDir = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
cacheDir = path.resolve(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
await io.cp(binDir, cacheDir, {
|
||||
recursive: true,
|
||||
});
|
||||
|
||||
+2
-2
@@ -85,7 +85,7 @@ export async function winInstall(version: Version): Promise<void> {
|
||||
|
||||
let toolDir = '';
|
||||
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
||||
const fullCachePath = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
const fullCachePath = path.resolve(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
try {
|
||||
try {
|
||||
fs.accessSync(path.join(fullCachePath, 'xmake.exe'), fs.constants.X_OK);
|
||||
@@ -146,7 +146,7 @@ export async function winInstall(version: Version): Promise<void> {
|
||||
if (toolDir) {
|
||||
let cacheDir = '';
|
||||
if (actionsCacheFolder && process.env.GITHUB_WORKSPACE) {
|
||||
cacheDir = path.join(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
cacheDir = path.resolve(process.env.GITHUB_WORKSPACE, actionsCacheFolder);
|
||||
await io.cp(toolDir, cacheDir, {
|
||||
recursive: true,
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user