Update CHANGELOG

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from v1.0.13 to v1.0.14.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Commits](https://github.com/codecov/codecov-action/compare/v1.0.13...7d5dfa54903bd909319c580a00535b483d1efcf3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: ci
 
 on:
   schedule:
-    - cron: '0 * * * *' # every hours
+    - cron: '0 */4 * * *' # every 4 hours
   push:
     branches:
       - '**'
@@ -53,6 +53,29 @@ jobs:
           tag-sha: true
           tag-schedule: ${{ matrix.tag-schedule }}
 
+  coerce:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        tag-coerce-tag:
+          - "{{raw}}"
+          - "{{major}}.{{minor}}"
+          - "{{patch}}"
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2.3.3
+      -
+        name: Docker meta
+        uses: ./
+        with:
+          images: |
+            ${{ env.DOCKER_IMAGE }}
+            ghcr.io/name/app
+          tag-coerce-tag: ${{ matrix.tag-coerce-tag }}
+          tag-sha: true
+
   docker-push:
     runs-on: ubuntu-latest
     services:

.github/workflows/test.yml

@@ -39,7 +39,7 @@ jobs:
         run: yarn run test
       -
         name: Upload coverage
-        uses: codecov/codecov-action@v1.0.13
+        uses: codecov/codecov-action@v1.0.14
         if: success()
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.4.0 (2020/10/27)
+
+* Use RegExp to match against a Git tag instead of coerce
+
+## 1.3.0 (2020/10/26)
+
+* Set latest tag only if matches with a pattern
+
+## 1.2.0 (2020/10/26)
+
+* Coerces Git tag to semver (#3)
+
 ## 1.1.0 (2020/10/25)
 
 * Allow to templatize schedule tag (#1)

README.md

@@ -23,7 +23,8 @@ ___
   * [inputs](#inputs)
   * [outputs](#outputs)
 * [Notes](#notes)
-  * [Templates available for schedule tag](#templates-available-for-schedule-tag)
+  * [`tag-match` examples](#tag-match-examples)
+  * [Schedule tag](#schedule-tag)
 * [Keep up-to-date with GitHub Dependabot](#keep-up-to-date-with-github-dependabot)
 * [How can I help?](#how-can-i-help)
 * [License](#license)
@@ -37,8 +38,8 @@ ___
 ## Overview
 
 | Event           | Ref                           | Commit SHA | Docker Tags                         |
-|-----------------|-------------------------------|------------|------------------------------------|
+|-----------------|-------------------------------|------------|-------------------------------------|
-| `schedule`      |                               | `45f132a`  | `sha-45f132a`, `nightly`           |
+| `schedule`      | `refs/heads/master`           | `45f132a`  | `sha-45f132a`, `nightly`            |
 | `pull_request`  | `refs/pull/2/merge`           | `a123b57`  | `sha-a123b57`, `pr-2`               |
 | `push`          | `refs/heads/<default_branch>` | `676cae2`  | `sha-676cae2`, `edge`               |
 | `push`          | `refs/heads/dev`              | `cf20257`  | `sha-cf20257`, `dev`                |
@@ -73,10 +74,9 @@ jobs:
         id: docker_meta
         uses: crazy-max/ghaction-docker-meta@v1
         with:
-          images: |
+          images: name/app
-            name/app
-            ghcr.io/name/app
           tag-sha: true
+          tag-match: \\d{1,3}.\\d{1,3}.\\d{1,3}
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -114,7 +114,9 @@ Following inputs can be used as `step.with` keys
 | `tag-sha`           | Bool     | Add git short SHA as Docker tag (default `false`) |
 | `tag-edge`          | Bool     | Enable edge branch tagging (default `false`) |
 | `tag-edge-branch`   | String   | Branch that will be tagged as edge (default `repo.default_branch`) |
-| `tag-schedule`      | String   | [Handlebars template](https://handlebarsjs.com/guide/) to apply to schedule tag (default `nightly`) |
+| `tag-match`         | String   | RegExp to match against a Git tag and use match group as Docker tag |
+| `tag-match-latest`  | Bool     | Set `latest` Docker tag if `tag-match` matches (default `true`) |
+| `tag-schedule`      | String   | [Template](#schedule-tag) to apply to schedule tag (default `nightly`) |
 | `sep-tags`          | String   | Separator to use for tags output (default `\n`) |
 | `sep-labels`        | String   | Separator to use for labels output (default `\n`) |
 
@@ -132,7 +134,17 @@ Following outputs are available
 
 ## Notes
 
-### Templates available for schedule tag
+### `tag-match` examples
+
+| Git tag                 | `tag-match`                    | Docker tag
+|-------------------------|--------------------------------|-------------------|
+| `v1.2.3`                | `\\d{1,3}.\\d{1,3}.\\d{1,3}`   | `1.2.3`           |
+| `v2.0.8-beta.67`        | `\\d{1,3}.\\d{1,3}.\\d{1,3}.*` | `2.0.8-beta.67`   |
+| `v2.0.8-beta.67`        | `\\d{1,3}.\\d{1,3}`            | `2.0`             |
+| `release1`              | `\\d{1,3}.\\d{1,3}`            | `release1`        |
+| `20200110-RC2`          | `\\d+`                         | `20200110`        |
+
+### Schedule tag
 
 `tag-schedule` is specially crafted input to support [Handlebars template](https://handlebarsjs.com/guide/) with
 the following expressions:

__tests__/fixtures/event_tag_20200110-RC2.env

@@ -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/20200110-RC2
+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

__tests__/fixtures/event_tag_sometag.env

@@ -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/sometag
+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

__tests__/fixtures/event_tag_v2.0.8-beta.67.env

@@ -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/v2.0.8-beta.67
+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

action.yml

@@ -21,8 +21,15 @@ inputs:
   tag-edge-branch:
     description: 'Branch that will be tagged as edge (default repo.default_branch)'
     required: false
+  tag-match:
+    description: 'RegExp to match against a Git tag and use match group as Docker tag'
+    required: false
+  tag-match-latest:
+    description: 'Set latest Docker tag if tag-match matches'
+    default: 'true'
+    required: false
   tag-schedule:
-    description: 'Handlebars template to apply to schedule tag'
+    description: 'Template to apply to schedule tag'
     default: 'nightly'
     required: false
   sep-tags:

package.json

@@ -26,8 +26,7 @@
     "@actions/core": "^1.2.6",
     "@actions/github": "^4.0.0",
     "handlebars": "^4.7.6",
-    "moment": "^2.29.1",
+    "moment": "^2.29.1"
-    "semver": "^7.3.2"
   },
   "devDependencies": {
     "@types/jest": "^26.0.0",

src/context.ts

@@ -5,6 +5,8 @@ export interface Inputs {
   tagSha: boolean;
   tagEdge: boolean;
   tagEdgeBranch: string;
+  tagMatch: string;
+  tagMatchLatest: boolean;
   tagSchedule: string;
   sepTags: string;
   sepLabels: string;
@@ -17,6 +19,8 @@ export function getInputs(): Inputs {
     tagSha: /true/i.test(core.getInput('tag-sha') || 'false'),
     tagEdge: /true/i.test(core.getInput('tag-edge') || 'false'),
     tagEdgeBranch: core.getInput('tag-edge-branch'),
+    tagMatch: core.getInput('tag-match'),
+    tagMatchLatest: /true/i.test(core.getInput('tag-match-latest') || 'true'),
     tagSchedule: core.getInput('tag-schedule') || 'nightly',
     sepTags: core.getInput('sep-tags') || `\n`,
     sepLabels: core.getInput('sep-labels') || `\n`,

src/main.ts

@@ -1,6 +1,6 @@
 import {getInputs, Inputs} from './context';
 import * as github from './github';
-import {Meta} from './meta';
+import {Meta, Version} from './meta';
 import * as core from '@actions/core';
 import {Context} from '@actions/github/lib/context';
 import {ReposGetResponseData} from '@octokit/types';
@@ -27,11 +27,11 @@ async function run() {
 
     const meta: Meta = new Meta(inputs, context, repo);
 
-    const version: string | undefined = meta.version();
+    const version: Version = meta.version();
     core.startGroup(`Docker image version`);
-    core.info(`${version}`);
+    core.info(version.version || '');
     core.endGroup();
-    core.setOutput('version', version || '');
+    core.setOutput('version', version.version || '');
 
     const tags: Array<string> = meta.tags();
     core.startGroup(`Docker tags`);

src/meta.ts

@@ -1,11 +1,14 @@
 import * as handlebars from 'handlebars';
 import * as moment from 'moment';
-import * as semver from 'semver';
 import {Inputs} from './context';
-import * as core from '@actions/core';
 import {Context} from '@actions/github/lib/context';
 import {ReposGetResponseData} from '@octokit/types';
 
+export interface Version {
+  version: string | undefined;
+  latest: boolean;
+}
+
 export class Meta {
   private readonly inputs: Inputs;
   private readonly context: Context;
@@ -22,35 +25,51 @@ export class Meta {
     this.date = new Date();
   }
 
-  public version(): string | undefined {
+  public version(): Version {
+    const currentDate = this.date;
+    const version: Version = {
+      version: undefined,
+      latest: false
+    };
+
     if (/schedule/.test(this.context.eventName)) {
-      return handlebars.compile(this.inputs.tagSchedule)(this.scheduleTplContext());
+      version.version = handlebars.compile(this.inputs.tagSchedule)({
-    } else if (/^refs\/tags\//.test(this.context.ref)) {
+        date: function (format) {
-      const tag = this.context.ref.replace(/^refs\/tags\//g, '').replace(/\//g, '-');
+          return moment(currentDate).utc().format(format);
-      const sver = semver.clean(tag);
-      return sver ? sver : tag;
-    } else if (/^refs\/heads\//.test(this.context.ref)) {
-      const branch = this.context.ref.replace(/^refs\/heads\//g, '').replace(/\//g, '-');
-      return this.inputs.tagEdge && this.inputs.tagEdgeBranch === branch ? 'edge' : branch;
-    } else if (/^refs\/pull\//.test(this.context.ref)) {
-      const pr = this.context.ref.replace(/^refs\/pull\//g, '').replace(/\/merge$/g, '');
-      return `pr-${pr}`;
         }
+      });
+    } else if (/^refs\/tags\//.test(this.context.ref)) {
+      version.version = this.context.ref.replace(/^refs\/tags\//g, '').replace(/\//g, '-');
+      if (this.inputs.tagMatch) {
+        const tagMatch = version.version.match(this.inputs.tagMatch);
+        if (tagMatch) {
+          version.version = tagMatch[0];
+          version.latest = this.inputs.tagMatchLatest;
+        }
+      }
+    } else if (/^refs\/heads\//.test(this.context.ref)) {
+      version.version = this.context.ref.replace(/^refs\/heads\//g, '').replace(/\//g, '-');
+      if (this.inputs.tagEdge && this.inputs.tagEdgeBranch === version.version) {
+        version.version = 'edge';
+      }
+    } else if (/^refs\/pull\//.test(this.context.ref)) {
+      version.version = `pr-${this.context.ref.replace(/^refs\/pull\//g, '').replace(/\/merge$/g, '')}`;
+    }
+
+    return version;
   }
 
   public tags(): Array<string> {
+    const version: Version = this.version();
+    if (!version.version) {
+      return [];
+    }
+
     let tags: Array<string> = [];
     for (const image of this.inputs.images) {
-      if (/schedule/.test(this.context.eventName)) {
+      tags.push(`${image}:${version.version}`);
-        tags.push.apply(tags, this.eventSchedule(image));
+      if (version.latest) {
-      } else if (/^refs\/tags\//.test(this.context.ref)) {
+        tags.push(`${image}:latest`);
-        tags.push.apply(tags, this.eventTag(image));
-      } else if (/^refs\/heads\//.test(this.context.ref)) {
-        tags.push.apply(tags, this.eventBranch(image));
-      } else if (/^refs\/pull\//.test(this.context.ref)) {
-        tags.push.apply(tags, this.eventPullRequest(image));
-      } else {
-        core.warning(`Unknown event "${this.context.eventName}" with ref "${this.context.ref}"`);
       }
       if (this.context.sha && this.inputs.tagSha) {
         tags.push(`${image}:sha-${this.context.sha.substr(0, 7)}`);
@@ -65,46 +84,10 @@ export class Meta {
       `org.opencontainers.image.description=${this.repo.description || ''}`,
       `org.opencontainers.image.url=${this.repo.html_url || ''}`,
       `org.opencontainers.image.source=${this.repo.clone_url || ''}`,
-      `org.opencontainers.image.version=${this.version() || ''}`,
+      `org.opencontainers.image.version=${this.version().version || ''}`,
       `org.opencontainers.image.created=${this.date.toISOString()}`,
       `org.opencontainers.image.revision=${this.context.sha || ''}`,
       `org.opencontainers.image.licenses=${this.repo.license?.spdx_id || ''}`
     ];
   }
-
-  private eventSchedule(image: string): Array<string> {
-    const schedule = handlebars.compile(this.inputs.tagSchedule)(this.scheduleTplContext());
-    return [`${image}:${schedule}`];
-  }
-
-  private eventTag(image: string): Array<string> {
-    const tag = this.context.ref.replace(/^refs\/tags\//g, '').replace(/\//g, '-');
-    const version = semver.clean(tag);
-    if (version) {
-      return [`${image}:${version}`, `${image}:latest`];
-    }
-    return [`${image}:${tag}`];
-  }
-
-  private eventBranch(image: string): Array<string> {
-    const branch = this.context.ref.replace(/^refs\/heads\//g, '').replace(/\//g, '-');
-    if (this.inputs.tagEdge && this.inputs.tagEdgeBranch === branch) {
-      return [`${image}:edge`];
-    }
-    return [`${image}:${branch}`];
-  }
-
-  private eventPullRequest(image: string): Array<string> {
-    const pr = this.context.ref.replace(/^refs\/pull\//g, '').replace(/\/merge$/g, '');
-    return [`${image}:pr-${pr}`];
-  }
-
-  private scheduleTplContext(): any {
-    const currentDate = this.date;
-    return {
-      date: function (format) {
-        return moment(currentDate).utc().format(format);
-      }
-    };
-  }
 }