Compare commits

..

8 Commits

Author SHA1 Message Date
CrazyMax
f39f06a624 Update CHANGELOG 2021-04-05 21:30:44 +02:00
CrazyMax
36ae18e02c Skip and display warning if tag does not match (#59)
Co-authored-by: CrazyMax <crazy-max@users.noreply.github.com>
2021-04-05 21:19:05 +02:00
CrazyMax
e87dd9466c Fix workflow 2021-04-03 18:44:12 +02:00
CrazyMax
9da1e66de9 Update CHANGELOG 2021-04-03 18:21:52 +02:00
CrazyMax
521a3c5ada Fix README (#56) 2021-04-03 18:18:32 +02:00
CrazyMax
7433b42479 Improve logging (#58)
Co-authored-by: CrazyMax <crazy-max@users.noreply.github.com>
2021-04-03 18:15:27 +02:00
CrazyMax
1a8a264b95 Update README 2021-03-31 10:01:20 +02:00
CrazyMax
e04b4d01a9 Cleanup 2021-03-30 13:57:33 +02:00
11 changed files with 301 additions and 100 deletions

View File

@@ -72,9 +72,9 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
- tag-match: '\d{1,3}.\d{1,3}.\d{1,3}' - tag-match: '\d.\d.\d'
tag-match-group: '0' tag-match-group: '0'
- tag-match: '\d{1,3}.\d{1,3}' - tag-match: '\d.\d'
tag-match-group: '0' tag-match-group: '0'
- tag-match: 'v(.*)' - tag-match: 'v(.*)'
tag-match-group: '1' tag-match-group: '1'

View File

@@ -1,9 +1,6 @@
name: label-sponsor name: label-sponsor
on: on:
pull_request:
types:
- 'opened'
issues: issues:
types: types:
- 'opened' - 'opened'

View File

@@ -1,5 +1,14 @@
# Changelog # Changelog
## 2.2.1 (2021/04/05)
* Skip and display warning if tag does not match (#59)
## 2.2.0 (2021/04/03)
* Improve logging (#58)
* Fix README (#56)
## 2.1.1 (2021/03/30) ## 2.1.1 (2021/03/30)
* Fix `enable` tag attribute (#53) * Fix `enable` tag attribute (#53)

View File

@@ -252,7 +252,7 @@ Following inputs can be used as `step.with` keys
> `List` type is a newline-delimited string > `List` type is a newline-delimited string
> ```yaml > ```yaml
> label-custom: | > labels: |
> org.opencontainers.image.title=MyCustomTitle > org.opencontainers.image.title=MyCustomTitle
> org.opencontainers.image.description=Another description > org.opencontainers.image.description=Another description
> org.opencontainers.image.vendor=MyCompany > org.opencontainers.image.vendor=MyCompany
@@ -420,9 +420,7 @@ tags: |
```yaml ```yaml
tags: | tags: |
# minimal # minimal
type=match,pattern=\d{8} type=match,pattern=\d.\d.\d
# double quotes if comma in pattern
type=match,"pattern=\d{1,3}.\d{1,3}.\d{1,3}"
# define match group # define match group
type=match,pattern=v(.*),group=1 type=match,pattern=v(.*),group=1
# use custom value instead of git tag # use custom value instead of git tag
@@ -435,16 +433,17 @@ a custom value through `value` attribute.
| Git tag | Pattern | Group | Output | | Git tag | Pattern | Group | Output |
|-------------------------|-------------------------------|---------|------------------------| |-------------------------|-------------------------------|---------|------------------------|
| `v1.2.3` | `\d{1,3}.\d{1,3}.\d{1,3}` | `0` | `1.2.3` | | `v1.2.3` | `\d.\d.\d` | `0` | `1.2.3` |
| `v2.0.8-beta.67` | `v(.*)` | `1` | `2.0.8-beta.67` | | `v2.0.8-beta.67` | `v(.*)` | `1` | `2.0.8-beta.67` |
| `v2.0.8-beta.67` | `v(\d.\d)` | `1` | `2.0` | | `v2.0.8-beta.67` | `v(\d.\d)` | `1` | `2.0` |
| `20200110-RC2` | `\d+` | `0` | `20200110` | | `20200110-RC2` | `\d+` | `0` | `20200110` |
| `p1/v1.2.3` | `p1-v(\d.\d.\d)` | `1` | `1.2.3` |
Extended attributes and default values: Extended attributes and default values:
```yaml ```yaml
tags: | tags: |
type=group,enable=true,priority=800,prefix=,suffix=,pattern=,group=0,value= type=match,enable=true,priority=800,prefix=,suffix=,pattern=,group=0,value=
``` ```
### `type=edge` ### `type=edge`
@@ -472,11 +471,11 @@ tags: |
```yaml ```yaml
tags: | tags: |
# minimal branch event # branch event
type=ref,event=branch type=ref,event=branch
# minimal tag event # tag event
type=ref,event=tag type=ref,event=tag
# minimal pull request event # pull request event
type=ref,event=pr type=ref,event=pr
``` ```
@@ -497,11 +496,11 @@ Extended attributes and default values:
```yaml ```yaml
tags: | tags: |
# event branch # branch event
type=ref,enable=true,priority=600,prefix=,suffix=,event= type=ref,enable=true,priority=600,prefix=,suffix=,event=
# event tag # tag event
type=ref,enable=true,priority=600,prefix=,suffix=,event= type=ref,enable=true,priority=600,prefix=,suffix=,event=
# event pr # pull request event
type=ref,enable=true,priority=600,prefix=pr-,suffix=,event= type=ref,enable=true,priority=600,prefix=pr-,suffix=,event=
``` ```

View File

@@ -0,0 +1,23 @@
GITHUB_ACTION=crazy-maxghaction-dump-context
GITHUB_ACTIONS=true
GITHUB_ACTION_PATH=/home/runner/work/_actions/crazy-max/ghaction-dump-context/v1
GITHUB_ACTOR=crazy-max
GITHUB_API_URL=https://api.github.com
GITHUB_BASE_REF=
GITHUB_ENV=/home/runner/work/_temp/_runner_file_commands/set_env_6ee180c2-b331-434a-a867-89534cbefd83
GITHUB_EVENT_NAME=push
#GITHUB_EVENT_PATH=/home/runner/work/_temp/_github_workflow/event.json
GITHUB_GRAPHQL_URL=https://api.github.com/graphql
GITHUB_HEAD_REF=
GITHUB_JOB=event
GITHUB_PATH=/home/runner/work/_temp/_runner_file_commands/add_path_6ee180c2-b331-434a-a867-89534cbefd83
GITHUB_REF=refs/tags/p1/v1.0.0
GITHUB_REPOSITORY=crazy-max/test-docker-action
GITHUB_REPOSITORY_OWNER=crazy-max
GITHUB_RETENTION_DAYS=90
GITHUB_RUN_ID=325968230
GITHUB_RUN_NUMBER=4
GITHUB_SERVER_URL=https://github.com
GITHUB_SHA=90dd6032fac8bda1b6c4436a2e65de27961ed071
GITHUB_WORKFLOW=event
GITHUB_WORKSPACE=/home/runner/work/test-docker-action/test-docker-action

View File

@@ -557,6 +557,35 @@ describe('push', () => {
"org.opencontainers.image.revision=90dd6032fac8bda1b6c4436a2e65de27961ed071", "org.opencontainers.image.revision=90dd6032fac8bda1b6c4436a2e65de27961ed071",
"org.opencontainers.image.licenses=MIT" "org.opencontainers.image.licenses=MIT"
] ]
],
[
'push16',
'event_push_defbranch.env',
{
images: ['user/app'],
tags: [
`type=match,enable=false,pattern=v(.*),group=1,value=v1.2.3`,
`type=edge`
],
} as Inputs,
{
main: 'edge',
partial: [],
latest: false
} as Version,
[
'user/app:edge'
],
[
"org.opencontainers.image.title=Hello-World",
"org.opencontainers.image.description=This your first repo!",
"org.opencontainers.image.url=https://github.com/octocat/Hello-World",
"org.opencontainers.image.source=https://github.com/octocat/Hello-World",
"org.opencontainers.image.version=edge",
"org.opencontainers.image.created=2020-01-10T00:30:00.000Z",
"org.opencontainers.image.revision=90dd6032fac8bda1b6c4436a2e65de27961ed071",
"org.opencontainers.image.licenses=MIT"
]
] ]
])('given %p with %p event', tagsLabelsTest); ])('given %p with %p event', tagsLabelsTest);
}); });
@@ -684,7 +713,7 @@ describe('tag', () => {
{ {
images: ['org/app', 'ghcr.io/user/app'], images: ['org/app', 'ghcr.io/user/app'],
tags: [ tags: [
`type=match,"pattern=\\d{1,3}.\\d{1,3}.\\d{1,3}"` `type=match,"pattern=\\d.\\d.\\d"`
] ]
} as Inputs, } as Inputs,
{ {
@@ -715,7 +744,7 @@ describe('tag', () => {
{ {
images: ['org/app', 'ghcr.io/user/app'], images: ['org/app', 'ghcr.io/user/app'],
tags: [ tags: [
`type=match,"pattern=^v(\\d{1,3}.\\d{1,3}.\\d{1,3})$",group=1` `type=match,"pattern=^v(\\d.\\d.\\d)$",group=1`
] ]
} as Inputs, } as Inputs,
{ {
@@ -746,7 +775,7 @@ describe('tag', () => {
{ {
images: ['org/app', 'ghcr.io/user/app'], images: ['org/app', 'ghcr.io/user/app'],
tags: [ tags: [
`type=match,"pattern=\\d{1,3}.\\d{1,3}.\\d{1,3}-(alpha|beta).\\d{1,3}"` `type=match,"pattern=\\d.\\d.\\d-(alpha|beta).\\d+"`
] ]
} as Inputs, } as Inputs,
{ {
@@ -777,7 +806,7 @@ describe('tag', () => {
{ {
images: ['org/app', 'ghcr.io/user/app'], images: ['org/app', 'ghcr.io/user/app'],
tags: [ tags: [
`type=match,"pattern=\\d{1,3}.\\d{1,3}"` `type=match,"pattern=\\d.\\d"`
] ]
} as Inputs, } as Inputs,
{ {
@@ -808,24 +837,29 @@ describe('tag', () => {
{ {
images: ['org/app', 'ghcr.io/user/app'], images: ['org/app', 'ghcr.io/user/app'],
tags: [ tags: [
`type=match,"pattern=/^v(\\d{1,3}.\\d{1,3}.\\d{1,3})$/ig",group=1`, `type=match,"pattern=v(.*)-beta.(.*)",group=1`,
`type=match,"pattern=v(.*)-beta.(.*)",group=2`,
] ]
} as Inputs, } as Inputs,
{ {
main: 'v2.0.8-beta.67', main: '2.0.8',
partial: [], partial: ['67'],
latest: false latest: true
} as Version, } as Version,
[ [
'org/app:v2.0.8-beta.67', 'org/app:2.0.8',
'ghcr.io/user/app:v2.0.8-beta.67' 'org/app:67',
'org/app:latest',
'ghcr.io/user/app:2.0.8',
'ghcr.io/user/app:67',
'ghcr.io/user/app:latest'
], ],
[ [
"org.opencontainers.image.title=Hello-World", "org.opencontainers.image.title=Hello-World",
"org.opencontainers.image.description=This your first repo!", "org.opencontainers.image.description=This your first repo!",
"org.opencontainers.image.url=https://github.com/octocat/Hello-World", "org.opencontainers.image.url=https://github.com/octocat/Hello-World",
"org.opencontainers.image.source=https://github.com/octocat/Hello-World", "org.opencontainers.image.source=https://github.com/octocat/Hello-World",
"org.opencontainers.image.version=v2.0.8-beta.67", "org.opencontainers.image.version=2.0.8",
"org.opencontainers.image.created=2020-01-10T00:30:00.000Z", "org.opencontainers.image.created=2020-01-10T00:30:00.000Z",
"org.opencontainers.image.revision=90dd6032fac8bda1b6c4436a2e65de27961ed071", "org.opencontainers.image.revision=90dd6032fac8bda1b6c4436a2e65de27961ed071",
"org.opencontainers.image.licenses=MIT" "org.opencontainers.image.licenses=MIT"
@@ -837,24 +871,21 @@ describe('tag', () => {
{ {
images: ['org/app', 'ghcr.io/user/app'], images: ['org/app', 'ghcr.io/user/app'],
tags: [ tags: [
`type=match,"pattern=\\d{1,3}.\\d{1,3}"` `type=match,"pattern=\\d.\\d"`
] ]
} as Inputs, } as Inputs,
{ {
main: 'sometag', main: undefined,
partial: [], partial: [],
latest: false latest: false
} as Version, } as Version,
[ [],
'org/app:sometag',
'ghcr.io/user/app:sometag'
],
[ [
"org.opencontainers.image.title=Hello-World", "org.opencontainers.image.title=Hello-World",
"org.opencontainers.image.description=This your first repo!", "org.opencontainers.image.description=This your first repo!",
"org.opencontainers.image.url=https://github.com/octocat/Hello-World", "org.opencontainers.image.url=https://github.com/octocat/Hello-World",
"org.opencontainers.image.source=https://github.com/octocat/Hello-World", "org.opencontainers.image.source=https://github.com/octocat/Hello-World",
"org.opencontainers.image.version=sometag", "org.opencontainers.image.version=",
"org.opencontainers.image.created=2020-01-10T00:30:00.000Z", "org.opencontainers.image.created=2020-01-10T00:30:00.000Z",
"org.opencontainers.image.revision=90dd6032fac8bda1b6c4436a2e65de27961ed071", "org.opencontainers.image.revision=90dd6032fac8bda1b6c4436a2e65de27961ed071",
"org.opencontainers.image.licenses=MIT" "org.opencontainers.image.licenses=MIT"
@@ -1001,7 +1032,7 @@ describe('tag', () => {
tags: [ tags: [
`type=raw,priority=2000,foo`, `type=raw,priority=2000,foo`,
`type=semver,pattern={{version}}`, `type=semver,pattern={{version}}`,
`type=match,"pattern=\\d{1,3}.\\d{1,3}"` `type=match,"pattern=\\d.\\d"`
] ]
} as Inputs, } as Inputs,
{ {
@@ -1060,6 +1091,84 @@ describe('tag', () => {
"org.opencontainers.image.revision=90dd6032fac8bda1b6c4436a2e65de27961ed071", "org.opencontainers.image.revision=90dd6032fac8bda1b6c4436a2e65de27961ed071",
"org.opencontainers.image.licenses=MIT" "org.opencontainers.image.licenses=MIT"
] ]
],
[
'tag17',
'event_tag_p1-v1.0.0.env',
{
images: ['org/app', 'ghcr.io/user/app'],
tags: [
`type=match,"pattern=/^v(\\d.\\d.\\d)$/ig",group=1`,
`type=match,pattern=\\d.\\d.\\d`,
`type=match,pattern=\\d.\\d`,
`type=ref,event=pr`,
`type=sha`
]
} as Inputs,
{
main: '1.0.0',
partial: ['1.0', 'sha-90dd603'],
latest: true
} as Version,
[
'org/app:1.0.0',
'org/app:1.0',
'org/app:sha-90dd603',
'org/app:latest',
'ghcr.io/user/app:1.0.0',
'ghcr.io/user/app:1.0',
'ghcr.io/user/app:sha-90dd603',
'ghcr.io/user/app:latest'
],
[
"org.opencontainers.image.title=Hello-World",
"org.opencontainers.image.description=This your first repo!",
"org.opencontainers.image.url=https://github.com/octocat/Hello-World",
"org.opencontainers.image.source=https://github.com/octocat/Hello-World",
"org.opencontainers.image.version=1.0.0",
"org.opencontainers.image.created=2020-01-10T00:30:00.000Z",
"org.opencontainers.image.revision=90dd6032fac8bda1b6c4436a2e65de27961ed071",
"org.opencontainers.image.licenses=MIT"
]
],
[
'tag18',
'event_tag_p1-v1.0.0.env',
{
images: ['org/app', 'ghcr.io/user/app'],
tags: [
`type=match,pattern=p1-v(\\d.\\d.\\d),group=1`,
`type=match,pattern=p1-v(\\d.\\d),group=1`,
`type=match,pattern=p1-v(\\d.\\d),group=3`,
`type=ref,event=pr`,
`type=sha`
]
} as Inputs,
{
main: '1.0.0',
partial: ['1.0', 'sha-90dd603'],
latest: true
} as Version,
[
'org/app:1.0.0',
'org/app:1.0',
'org/app:sha-90dd603',
'org/app:latest',
'ghcr.io/user/app:1.0.0',
'ghcr.io/user/app:1.0',
'ghcr.io/user/app:sha-90dd603',
'ghcr.io/user/app:latest'
],
[
"org.opencontainers.image.title=Hello-World",
"org.opencontainers.image.description=This your first repo!",
"org.opencontainers.image.url=https://github.com/octocat/Hello-World",
"org.opencontainers.image.source=https://github.com/octocat/Hello-World",
"org.opencontainers.image.version=1.0.0",
"org.opencontainers.image.created=2020-01-10T00:30:00.000Z",
"org.opencontainers.image.revision=90dd6032fac8bda1b6c4436a2e65de27961ed071",
"org.opencontainers.image.licenses=MIT"
]
] ]
])('given %p with %p event', tagsLabelsTest); ])('given %p with %p event', tagsLabelsTest);
}); });
@@ -1160,7 +1269,7 @@ describe('latest', () => {
{ {
images: ['user/app'], images: ['user/app'],
tags: [ tags: [
`type=match,"pattern=\\d{1,3}.\\d{1,3}.\\d{1,3}"` `type=match,"pattern=\\d.\\d.\\d"`
] ]
} as Inputs, } as Inputs,
{ {
@@ -1217,7 +1326,7 @@ describe('latest', () => {
{ {
images: ['org/app', 'ghcr.io/user/app'], images: ['org/app', 'ghcr.io/user/app'],
tags: [ tags: [
`type=match,"pattern=\\d{1,3}.\\d{1,3}.\\d{1,3}"` `type=match,"pattern=\\d.\\d.\\d"`
] ]
} as Inputs, } as Inputs,
{ {
@@ -2358,40 +2467,3 @@ describe('bake', () => {
expect(JSON.parse(fs.readFileSync(bakeFile, 'utf8'))).toEqual(exBakeDefinition); expect(JSON.parse(fs.readFileSync(bakeFile, 'utf8'))).toEqual(exBakeDefinition);
}); });
}); });
describe('push', () => {
// prettier-ignore
test.each([
[
'push15',
'event_push_defbranch.env',
{
images: ['user/app'],
tags: [
`type=match,pattern=v(.*),group=1,value=v1.2.3`,
`type=edge`
],
} as Inputs,
{
main: '1.2.3',
partial: ['edge'],
latest: true
} as Version,
[
'user/app:1.2.3',
'user/app:edge',
'user/app:latest'
],
[
"org.opencontainers.image.title=Hello-World",
"org.opencontainers.image.description=This your first repo!",
"org.opencontainers.image.url=https://github.com/octocat/Hello-World",
"org.opencontainers.image.source=https://github.com/octocat/Hello-World",
"org.opencontainers.image.version=1.2.3",
"org.opencontainers.image.created=2020-01-10T00:30:00.000Z",
"org.opencontainers.image.revision=90dd6032fac8bda1b6c4436a2e65de27961ed071",
"org.opencontainers.image.licenses=MIT"
]
]
])('given %p with %p event', tagsLabelsTest);
});

View File

@@ -13,7 +13,7 @@ describe('transform', () => {
`type=raw,foo`, `type=raw,foo`,
`type=edge`, `type=edge`,
`type=semver,pattern={{version}}`, `type=semver,pattern={{version}}`,
`type=match,"pattern=\\d{1,3}.\\d{1,3}.\\d{1,3}"` `type=match,"pattern=\\d.\\d.\\d",group=0`
], ],
[ [
{ {
@@ -44,7 +44,7 @@ describe('transform', () => {
"enable": "true", "enable": "true",
"prefix": "", "prefix": "",
"suffix": "", "suffix": "",
"pattern": "\\d{1,3}.\\d{1,3}.\\d{1,3}", "pattern": "\\d.\\d.\\d",
"group": "0", "group": "0",
"value": "" "value": ""
} }
@@ -204,7 +204,7 @@ describe('parse', () => {
false false
], ],
[ [
`type=match,enable=true,"pattern=^v(\\d{1,3}.\\d{1,3}.\\d{1,3})$",group=1`, `type=match,enable=true,"pattern=^v(\\d.\\d.\\d)$",group=1`,
{ {
type: Type.Match, type: Type.Match,
attrs: { attrs: {
@@ -212,7 +212,7 @@ describe('parse', () => {
"enable": "true", "enable": "true",
"prefix": "", "prefix": "",
"suffix": "", "suffix": "",
"pattern": "^v(\\d{1,3}.\\d{1,3}.\\d{1,3})$", "pattern": "^v(\\d.\\d.\\d)$",
"group": "1", "group": "1",
"value": "" "value": ""
} }

84
dist/index.js generated vendored
View File

@@ -99,12 +99,32 @@ exports.asyncForEach = (array, callback) => __awaiter(void 0, void 0, void 0, fu
/***/ }), /***/ }),
/***/ 3716: /***/ 3716:
/***/ ((__unused_webpack_module, exports) => { /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
"use strict"; "use strict";
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
}) : (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
o[k2] = m[k];
}));
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
Object.defineProperty(o, "default", { enumerable: true, value: v });
}) : function(o, v) {
o["default"] = v;
});
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
__setModuleDefault(result, mod);
return result;
};
Object.defineProperty(exports, "__esModule", ({ value: true })); Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.Transform = void 0; exports.Transform = void 0;
const core = __importStar(__webpack_require__(2186));
function Transform(inputs) { function Transform(inputs) {
const flavor = { const flavor = {
latest: 'auto', latest: 'auto',
@@ -137,6 +157,11 @@ function Transform(inputs) {
} }
} }
} }
core.startGroup(`Processing flavor input`);
core.info(`latest=${flavor.latest}`);
core.info(`prefix=${flavor.prefix}`);
core.info(`suffix=${flavor.suffix}`);
core.endGroup();
return flavor; return flavor;
} }
exports.Transform = Transform; exports.Transform = Transform;
@@ -493,10 +518,16 @@ class Meta {
else { else {
tmatch = vraw.match(tag.attrs['pattern']); tmatch = vraw.match(tag.attrs['pattern']);
} }
if (tmatch) { if (!tmatch) {
core.warning(`${tag.attrs['pattern']} does not match ${vraw}.`);
return version;
}
if (typeof tmatch[tag.attrs['group']] === 'undefined') {
core.warning(`Group ${tag.attrs['group']} does not exist for ${tag.attrs['pattern']} pattern.`);
return version;
}
vraw = tmatch[tag.attrs['group']]; vraw = tmatch[tag.attrs['group']];
latest = true; latest = true;
}
if (version.main == undefined) { if (version.main == undefined) {
version.main = vraw; version.main = vraw;
} }
@@ -690,12 +721,32 @@ exports.Meta = Meta;
"use strict"; "use strict";
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
}) : (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
o[k2] = m[k];
}));
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
Object.defineProperty(o, "default", { enumerable: true, value: v });
}) : function(o, v) {
o["default"] = v;
});
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
__setModuleDefault(result, mod);
return result;
};
var __importDefault = (this && this.__importDefault) || function (mod) { var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod }; return (mod && mod.__esModule) ? mod : { "default": mod };
}; };
Object.defineProperty(exports, "__esModule", ({ value: true })); Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.Parse = exports.Transform = exports.DefaultPriorities = exports.RefEvent = exports.Type = void 0; exports.Parse = exports.Transform = exports.DefaultPriorities = exports.Tag = exports.RefEvent = exports.Type = void 0;
const sync_1 = __importDefault(__webpack_require__(8750)); const sync_1 = __importDefault(__webpack_require__(8750));
const core = __importStar(__webpack_require__(2186));
var Type; var Type;
(function (Type) { (function (Type) {
Type["Schedule"] = "schedule"; Type["Schedule"] = "schedule";
@@ -712,6 +763,19 @@ var RefEvent;
RefEvent["Tag"] = "tag"; RefEvent["Tag"] = "tag";
RefEvent["PR"] = "pr"; RefEvent["PR"] = "pr";
})(RefEvent = exports.RefEvent || (exports.RefEvent = {})); })(RefEvent = exports.RefEvent || (exports.RefEvent = {}));
class Tag {
constructor() {
this.attrs = {};
}
toString() {
const out = [`type=${this.type}`];
for (let attr in this.attrs) {
out.push(`${attr}=${this.attrs[attr]}`);
}
return out.join(',');
}
}
exports.Tag = Tag;
exports.DefaultPriorities = { exports.DefaultPriorities = {
[Type.Schedule]: '1000', [Type.Schedule]: '1000',
[Type.Semver]: '900', [Type.Semver]: '900',
@@ -735,7 +799,7 @@ function Transform(inputs) {
for (const input of inputs) { for (const input of inputs) {
tags.push(Parse(input)); tags.push(Parse(input));
} }
return tags.sort((tag1, tag2) => { const sorted = tags.sort((tag1, tag2) => {
if (Number(tag1.attrs['priority']) < Number(tag2.attrs['priority'])) { if (Number(tag1.attrs['priority']) < Number(tag2.attrs['priority'])) {
return 1; return 1;
} }
@@ -744,6 +808,12 @@ function Transform(inputs) {
} }
return 0; return 0;
}); });
core.startGroup(`Processing tags input`);
for (const tag of sorted) {
core.info(tag.toString());
}
core.endGroup();
return sorted;
} }
exports.Transform = Transform; exports.Transform = Transform;
function Parse(s) { function Parse(s) {
@@ -751,9 +821,7 @@ function Parse(s) {
relaxColumnCount: true, relaxColumnCount: true,
skipLinesWithEmptyValues: true skipLinesWithEmptyValues: true
})[0]; })[0];
const tag = { const tag = new Tag();
attrs: {}
};
for (const field of fields) { for (const field of fields) {
const parts = field.toString().split('=', 2); const parts = field.toString().split('=', 2);
if (parts.length == 1) { if (parts.length == 1) {

View File

@@ -1,3 +1,5 @@
import * as core from '@actions/core';
export interface Flavor { export interface Flavor {
latest: string; latest: string;
prefix: string; prefix: string;
@@ -38,5 +40,11 @@ export function Transform(inputs: string[]): Flavor {
} }
} }
core.startGroup(`Processing flavor input`);
core.info(`latest=${flavor.latest}`);
core.info(`prefix=${flavor.prefix}`);
core.info(`suffix=${flavor.suffix}`);
core.endGroup();
return flavor; return flavor;
} }

View File

@@ -47,7 +47,6 @@ export class Meta {
if (tag.attrs['enable'] == 'false') { if (tag.attrs['enable'] == 'false') {
continue; continue;
} }
switch (tag.type) { switch (tag.type) {
case tcl.Type.Schedule: { case tcl.Type.Schedule: {
version = this.procSchedule(version, tag); version = this.procSchedule(version, tag);
@@ -181,10 +180,17 @@ export class Meta {
} else { } else {
tmatch = vraw.match(tag.attrs['pattern']); tmatch = vraw.match(tag.attrs['pattern']);
} }
if (tmatch) { if (!tmatch) {
core.warning(`${tag.attrs['pattern']} does not match ${vraw}.`);
return version;
}
if (typeof tmatch[tag.attrs['group']] === 'undefined') {
core.warning(`Group ${tag.attrs['group']} does not exist for ${tag.attrs['pattern']} pattern.`);
return version;
}
vraw = tmatch[tag.attrs['group']]; vraw = tmatch[tag.attrs['group']];
latest = true; latest = true;
}
if (version.main == undefined) { if (version.main == undefined) {
version.main = vraw; version.main = vraw;

View File

@@ -1,4 +1,5 @@
import csvparse from 'csv-parse/lib/sync'; import csvparse from 'csv-parse/lib/sync';
import * as core from '@actions/core';
export enum Type { export enum Type {
Schedule = 'schedule', Schedule = 'schedule',
@@ -16,9 +17,21 @@ export enum RefEvent {
PR = 'pr' PR = 'pr'
} }
export interface Tag { export class Tag {
type: Type; public type?: Type;
attrs: Record<string, string>; public attrs: Record<string, string>;
constructor() {
this.attrs = {};
}
public toString(): string {
const out: string[] = [`type=${this.type}`];
for (let attr in this.attrs) {
out.push(`${attr}=${this.attrs[attr]}`);
}
return out.join(',');
}
} }
export const DefaultPriorities: Record<Type, string> = { export const DefaultPriorities: Record<Type, string> = {
@@ -42,10 +55,11 @@ export function Transform(inputs: string[]): Tag[] {
`type=ref,event=${RefEvent.PR}` `type=ref,event=${RefEvent.PR}`
]; ];
} }
for (const input of inputs) { for (const input of inputs) {
tags.push(Parse(input)); tags.push(Parse(input));
} }
return tags.sort((tag1, tag2) => { const sorted = tags.sort((tag1, tag2) => {
if (Number(tag1.attrs['priority']) < Number(tag2.attrs['priority'])) { if (Number(tag1.attrs['priority']) < Number(tag2.attrs['priority'])) {
return 1; return 1;
} }
@@ -54,6 +68,14 @@ export function Transform(inputs: string[]): Tag[] {
} }
return 0; return 0;
}); });
core.startGroup(`Processing tags input`);
for (const tag of sorted) {
core.info(tag.toString());
}
core.endGroup();
return sorted;
} }
export function Parse(s: string): Tag { export function Parse(s: string): Tag {
@@ -62,10 +84,7 @@ export function Parse(s: string): Tag {
skipLinesWithEmptyValues: true skipLinesWithEmptyValues: true
})[0]; })[0];
const tag = { const tag = new Tag();
attrs: {}
} as Tag;
for (const field of fields) { for (const field of fields) {
const parts = field.toString().split('=', 2); const parts = field.toString().split('=', 2);
if (parts.length == 1) { if (parts.length == 1) {