neil/build-push-action
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use latest buildx for git context test

Browse Source 
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax 2020-08-16 19:22:14 +02:00
parent 9c473659de
commit 1c3fedb652
No known key found for this signature in database
GPG Key ID: 3248E46B6BB8C7F7
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/ci.yml vendored
View File

@ -76,14 +76,15 @@ jobs:
name: Set up Docker Buildx name: Set up Docker Buildx
id: buildx id: buildx
uses: ./setup-buildx/ # change to docker/setup-buildx-action@master uses: ./setup-buildx/ # change to docker/setup-buildx-action@master
# with: with:
# driver-opt: network=host version: latest
#driver-opt: network=host
- -
name: Build and push name: Build and push
uses: ./ uses: ./
env: env:
GITHUB_TOKEN: ${{ github.token }} GIT_AUTH_TOKEN: ${{ github.token }}
GITHUB_REF: ${{ github.ref }} GIT_REF: ${{ github.ref }}
with: with:
context: ${{ github.repositoryUrl }} context: ${{ github.repositoryUrl }}
file: ./test/Dockerfile file: ./test/Dockerfile

10
dist/index.js generated vendored
View File

@ -1912,10 +1912,12 @@ function getBuildContext() {
return '.'; return '.';
} }
try { try {
const gitURL = git_url_parse_1.default(context); const gitUrl = git_url_parse_1.default(context);
gitURL.token = gitURL.token || process.env['GIT_TOKEN'] || process.env['GITHUB_TOKEN'] || ''; const gitRef = process.env['GIT_REF'] || '';
gitURL.ref = gitURL.ref || process.env['GIT_REF'] || process.env['GITHUB_REF'] || ''; if (gitRef) {
return gitURL.toString(); return `${gitUrl.toString()}#${gitRef}`;
}
return gitUrl.toString();
} }
catch (_a) { catch (_a) {
return context; return context;

10
src/context.ts
View File

@ -72,10 +72,12 @@ async function getBuildContext(): Promise<string> {
return '.'; return '.';
} }
try { try {
const gitURL = gitUrlParse(context); const gitUrl = gitUrlParse(context);
gitURL.token = gitURL.token || process.env['GIT_TOKEN'] || process.env['GITHUB_TOKEN'] || ''; const gitRef = process.env['GIT_REF'] || '';
gitURL.ref = gitURL.ref || process.env['GIT_REF'] || process.env['GITHUB_REF'] || ''; if (gitRef) {
return gitURL.toString(); return `${gitUrl.toString()}#${gitRef}`;
}
return gitUrl.toString();
} catch { } catch {
return context; return context;
} }