Merge pull request #537 from crazy-max/pep440-match

allow to match part of the git tag or value for pep440 type

dist/index.js

@@ -159,5 +159,5 @@ const c=a(57147);const p=a(22037);const l=a(71017);const A=a(6113);const d={fs:c
  * @license [MIT]{@link https://github.com/archiverjs/node-zip-stream/blob/master/LICENSE}
  * @copyright (c) 2014 Chris Talkington, contributors.
  */
-var c=a(73837).inherits;var p=a(25445).ZipArchiveOutputStream;var l=a(25445).ZipArchiveEntry;var A=a(82072);var d=r.exports=function(r){if(!(this instanceof d)){return new d(r)}r=this.options=r||{};r.zlib=r.zlib||{};p.call(this,r);if(typeof r.level==="number"&&r.level>=0){r.zlib.level=r.level;delete r.level}if(!r.forceZip64&&typeof r.zlib.level==="number"&&r.zlib.level===0){r.store=true}r.namePrependSlash=r.namePrependSlash||false;if(r.comment&&r.comment.length>0){this.setComment(r.comment)}};c(d,p);d.prototype._normalizeFileData=function(r){r=A.defaults(r,{type:"file",name:null,namePrependSlash:this.options.namePrependSlash,linkname:null,date:null,mode:null,store:this.options.store,comment:""});var i=r.type==="directory";var a=r.type==="symlink";if(r.name){r.name=A.sanitizePath(r.name);if(!a&&r.name.slice(-1)==="/"){i=true;r.type="directory"}else if(i){r.name+="/"}}if(i||a){r.store=true}r.date=A.dateify(r.date);return r};d.prototype.entry=function(r,i,a){if(typeof a!=="function"){a=this._emitErrorCallback.bind(this)}i=this._normalizeFileData(i);if(i.type!=="file"&&i.type!=="directory"&&i.type!=="symlink"){a(new Error(i.type+" entries not currently supported"));return}if(typeof i.name!=="string"||i.name.length===0){a(new Error("entry name must be a non-empty string value"));return}if(i.type==="symlink"&&typeof i.linkname!=="string"){a(new Error("entry linkname must be a non-empty string value when type equals symlink"));return}var c=new l(i.name);c.setTime(i.date,this.options.forceLocalTime);if(i.namePrependSlash){c.setName(i.name,true)}if(i.store){c.setMethod(0)}if(i.comment.length>0){c.setComment(i.comment)}if(i.type==="symlink"&&typeof i.mode!=="number"){i.mode=40960}if(typeof i.mode==="number"){if(i.type==="symlink"){i.mode|=40960}c.setUnixMode(i.mode)}if(i.type==="symlink"&&typeof i.linkname==="string"){r=Buffer.from(i.linkname)}return p.prototype.entry.call(this,c,r,a)};d.prototype.finalize=function(){this.finish()}},98954:function(r,i,a){"use strict";var c=this&&this.__createBinding||(Object.create?function(r,i,a,c){if(c===undefined)c=a;var p=Object.getOwnPropertyDescriptor(i,a);if(!p||("get"in p?!i.__esModule:p.writable||p.configurable)){p={enumerable:true,get:function(){return i[a]}}}Object.defineProperty(r,c,p)}:function(r,i,a,c){if(c===undefined)c=a;r[c]=i[a]});var p=this&&this.__setModuleDefault||(Object.create?function(r,i){Object.defineProperty(r,"default",{enumerable:true,value:i})}:function(r,i){r["default"]=i});var l=this&&this.__importStar||function(r){if(r&&r.__esModule)return r;var i={};if(r!=null)for(var a in r)if(a!=="default"&&Object.prototype.hasOwnProperty.call(r,a))c(i,r,a);p(i,r);return i};var A=this&&this.__awaiter||function(r,i,a,c){function adopt(r){return r instanceof a?r:new a((function(i){i(r)}))}return new(a||(a=Promise))((function(a,p){function fulfilled(r){try{step(c.next(r))}catch(r){p(r)}}function rejected(r){try{step(c["throw"](r))}catch(r){p(r)}}function step(r){r.done?a(r.value):adopt(r.value).then(fulfilled,rejected)}step((c=c.apply(r,i||[])).next())}))};Object.defineProperty(i,"__esModule",{value:true});i.getContext=i.ContextSource=i.getInputs=void 0;const d=l(a(42186));const u=a(28662);const h=a(26074);const b=a(6276);function getInputs(){return{context:d.getInput("context")||g.workflow,images:u.Util.getInputList("images",{ignoreComma:true,comment:"#"}),tags:u.Util.getInputList("tags",{ignoreComma:true,comment:"#"}),flavor:u.Util.getInputList("flavor",{ignoreComma:true,comment:"#"}),labels:u.Util.getInputList("labels",{ignoreComma:true,comment:"#"}),annotations:u.Util.getInputList("annotations",{ignoreComma:true,comment:"#"}),sepTags:d.getInput("sep-tags",{trimWhitespace:false})||`\n`,sepLabels:d.getInput("sep-labels",{trimWhitespace:false})||`\n`,sepAnnotations:d.getInput("sep-annotations",{trimWhitespace:false})||`\n`,bakeTarget:d.getInput("bake-target")||`docker-metadata-action`,githubToken:d.getInput("github-token")}}i.getInputs=getInputs;var g;(function(r){r["workflow"]="workflow";r["git"]="git"})(g||(i.ContextSource=g={}));function getContext(r,i){return A(this,void 0,void 0,(function*(){switch(r){case g.workflow:return yield getContextFromWorkflow(i);case g.git:return yield getContextFromGit();default:throw new Error(`Invalid context source: ${r}`)}}))}i.getContext=getContext;function getContextFromWorkflow(r){return A(this,void 0,void 0,(function*(){var i,a,c;const p=b.GitHub.context;if(/pull_request_target/.test(p.eventName)){p.ref=`refs/pull/${p.payload.number}/merge`}if(/true/i.test(process.env.DOCKER_METADATA_PR_HEAD_SHA||"")){if((/pull_request/.test(p.eventName)||/pull_request_target/.test(p.eventName))&&((c=(a=(i=p.payload)===null||i===void 0?void 0:i.pull_request)===null||a===void 0?void 0:a.head)===null||c===void 0?void 0:c.sha)!=undefined){p.sha=p.payload.pull_request.head.sha}}return Object.assign({commitDate:yield getCommitDateFromWorkflow(p.sha,r)},p)}))}function getContextFromGit(){return A(this,void 0,void 0,(function*(){const r=yield h.Git.Line truncated
+var c=a(73837).inherits;var p=a(25445).ZipArchiveOutputStream;var l=a(25445).ZipArchiveEntry;var A=a(82072);var d=r.exports=function(r){if(!(this instanceof d)){return new d(r)}r=this.options=r||{};r.zlib=r.zlib||{};p.call(this,r);if(typeof r.level==="number"&&r.level>=0){r.zlib.level=r.level;delete r.level}if(!r.forceZip64&&typeof r.zlib.level==="number"&&r.zlib.level===0){r.store=true}r.namePrependSlash=r.namePrependSlash||false;if(r.comment&&r.comment.length>0){this.setComment(r.comment)}};c(d,p);d.prototype._normalizeFileData=function(r){r=A.defaults(r,{type:"file",name:null,namePrependSlash:this.options.namePrependSlash,linkname:null,date:null,mode:null,store:this.options.store,comment:""});var i=r.type==="directory";var a=r.type==="symlink";if(r.name){r.name=A.sanitizePath(r.name);if(!a&&r.name.slice(-1)==="/"){i=true;r.type="directory"}else if(i){r.name+="/"}}if(i||a){r.store=true}r.date=A.dateify(r.date);return r};d.prototype.entry=function(r,i,a){if(typeof a!=="function"){a=this._emitErrorCallback.bind(this)}i=this._normalizeFileData(i);if(i.type!=="file"&&i.type!=="directory"&&i.type!=="symlink"){a(new Error(i.type+" entries not currently supported"));return}if(typeof i.name!=="string"||i.name.length===0){a(new Error("entry name must be a non-empty string value"));return}if(i.type==="symlink"&&typeof i.linkname!=="string"){a(new Error("entry linkname must be a non-empty string value when type equals symlink"));return}var c=new l(i.name);c.setTime(i.date,this.options.forceLocalTime);if(i.namePrependSlash){c.setName(i.name,true)}if(i.store){c.setMethod(0)}if(i.comment.length>0){c.setComment(i.comment)}if(i.type==="symlink"&&typeof i.mode!=="number"){i.mode=40960}if(typeof i.mode==="number"){if(i.type==="symlink"){i.mode|=40960}c.setUnixMode(i.mode)}if(i.type==="symlink"&&typeof i.linkname==="string"){r=Buffer.from(i.linkname)}return p.prototype.entry.call(this,c,r,a)};d.prototype.finalize=function(){this.finish()}},98954:function(r,i,a){"use strict";var c=this&&this.__createBinding||(Object.create?function(r,i,a,c){if(c===undefined)c=a;var p=Object.getOwnPropertyDescriptor(i,a);if(!p||("get"in p?!i.__esModule:p.writable||p.configurable)){p={enumerable:true,get:function(){return i[a]}}}Object.defineProperty(r,c,p)}:function(r,i,a,c){if(c===undefined)c=a;r[c]=i[a]});var p=this&&this.__setModuleDefault||(Object.create?function(r,i){Object.defineProperty(r,"default",{enumerable:true,value:i})}:function(r,i){r["default"]=i});var l=this&&this.__importStar||function(r){if(r&&r.__esModule)return r;var i={};if(r!=null)for(var a in r)if(a!=="default"&&Object.prototype.hasOwnProperty.call(r,a))c(i,r,a);p(i,r);return i};var A=this&&this.__awaiter||function(r,i,a,c){function adopt(r){return r instanceof a?r:new a((function(i){i(r)}))}return new(a||(a=Promise))((function(a,p){function fulfilled(r){try{step(c.next(r))}catch(r){p(r)}}function rejected(r){try{step(c["throw"](r))}catch(r){p(r)}}function step(r){r.done?a(r.value):adopt(r.value).then(fulfilled,rejected)}step((c=c.apply(r,i||[])).next())}))};Object.defineProperty(i,"__esModule",{value:true});i.getContext=i.ContextSource=i.getInputs=void 0;const d=l(a(42186));const u=a(28662);const h=a(26074);const b=a(6276);function getInputs(){return{context:d.getInput("context")||g.workflow,images:u.Util.getInputList("images",{ignoreComma:true,comment:"#"}),tags:u.Util.getInputList("tags",{ignoreComma:true,comment:"#"}),flavor:u.Util.getInputList("flavor",{ignoreComma:true,comment:"#"}),labels:u.Util.getInputList("labels",{ignoreComma:true,comment:"#"}),annotations:u.Util.getInputList("annotations",{ignoreComma:true,comment:"#"}),sepTags:d.getInput("sep-tags",{trimWhitespace:false})||`\n`,sepLabels:d.getInput("sep-labels",{trimWhitespace:false})||`\n`,sepAnnotations:d.getInput("sep-annotations",{trimWhitespace:false})||`\n`,bakeTarget:d.getInput("bake-target")||`docker-metadata-action`,githubToken:d.getInput("github-token")}}i.getInputs=getInputs;var g;(function(r){r["workflow"]="workflow";r["git"]="git"})(g||(i.ContextSource=g={}));function getContext(r,i){return A(this,void 0,void 0,(function*(){switch(r){case g.workflow:return yield getContextFromWorkflow(i);case g.git:return yield getContextFromGit();default:throw new Error(`Invalid context source: ${r}`)}}))}i.getContext=getContext;function getContextFromWorkflow(r){return A(this,void 0,void 0,(function*(){var i,a,c;const p=b.GitHub.context;if(/pull_request_target/.test(p.eventName)){p.ref=`refs/pull/${p.payload.number}/merge`}if(/true/i.test(process.env.DOCKER_METADATA_PR_HEAD_SHA||"")){if((/pull_request/.test(p.eventName)||/pull_request_target/.test(p.eventName))&&((c=(a=(i=p.payload)===null||i===void 0?void 0:i.pull_request)===null||a===void 0?void 0:a.head)===null||c===void 0?void 0:c.sha)!=undefined){p.sha=p.payload.pull_request.head.sha}}return Object.assign({commitDate:yield getCommitDateFromWorkflow(p.sha,r)},p)}))}function getContextFromGit(){return A(this,void 0,void 0,(function*(){const r=yield h.Git.Line truncated
 //# sourceMappingURL=index.js.map

dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["__createBinding","this","Object","create","o","m","k","k2","undefined","desc","getOwnPropertyDescriptor","__esModule","writable","configurable","enumerable","get","defineProperty","__exportStar","exports","p","prototype","hasOwnProperty","call","value","client_1","__webpack_require__","client","DefaultArtifactClient","Timestamp","runtime_1","runtime_2","runtime_3","runtime_4","runtime_5","runtime_6","runtime_7","Timestamp$Type","MessageType","constructor","super","no","name","kind","T","now","msg","ms","Date","seconds","PbLong","from","Math","floor","toString","nanos","toDate","message","toNumber","ceil","fromDate","date","getTime","internalJsonWrite","options","parse","Error","z","nanosStr","substring","toISOString","replace","internalJsonRead","json","target","typeofJsonValue","matches","match","Number","isNaN","globalThis","parseInt","repeat","length","MESSAGE_TYPE","reflectionMergePartial","internalBinaryRead","reader","end","pos","fieldNo","wireType","tag","int64","int32","u","readUnknownField","typeName","d","skip","UnknownFieldHandler","onRead","internalBinaryWrite","writer","WireType","Varint","writeUnknownFields","onWrite","BytesValue","StringValue","BoolValue","UInt32Value","Int32Value","UInt64Value","Int64Value","FloatValue","DoubleValue","DoubleValue$Type","refJsonWriter","scalar","refJsonReader","double","Bit64","FloatValue$Type","float","Bit32","Int64Value$Type","ScalarType","INT64","LongType","STRING","UInt64Value$Type","UINT64","uint64","Int32Value$Type","UInt32Value$Type","uint32","BoolValue$Type","bool","StringValue$Type","string","LengthDelimited","BytesValue$Type","Uint8Array","bytes","ArtifactService","DeleteArtifactResponse","DeleteArtifactRequest","GetSignedArtifactURLResponse","GetSignedArtifactURLRequest","ListArtifactsResponse_MonolithArtifact","ListArtifactsResponse","ListArtifactsRequest","FinalizeArtifactResponse","FinalizeArtifactRequest","CreateArtifactResponse","CreateArtifactRequest","FinalizeMigratedArtifactResponse","FinalizeMigratedArtifactRequest","MigrateArtifactResponse","MigrateArtifactRequest","runtime_rpc_1","wrappers_1","wrappers_2","timestamp_1","MigrateArtifactRequest$Type","workflowRunBackendId","expiresAt","fork","join","MigrateArtifactResponse$Type","ok","signedUploadUrl","FinalizeMigratedArtifactRequest$Type","size","FinalizeMigratedArtifactResponse$Type","artifactId","CreateArtifactRequest$Type","workflowJobRunBackendId","version","CreateArtifactResponse$Type","FinalizeArtifactRequest$Type","hash","FinalizeArtifactResponse$Type","ListArtifactsRequest$Type","nameFilter","idFilter","ListArtifactsResponse$Type","artifacts","push","i","ListArtifactsResponse_MonolithArtifact$Type","databaseId","createdAt","digest","GetSignedArtifactURLRequest$Type","GetSignedArtifactURLResponse$Type","signedUrl","DeleteArtifactRequest$Type","DeleteArtifactResponse$Type","ServiceType","I","O","ArtifactServiceClientProtobuf","ArtifactServiceClientJSON","artifact_1","rpc","CreateArtifact","bind","FinalizeArtifact","ListArtifacts","GetSignedArtifactURL","DeleteArtifact","request","data","toJson","useProtoFieldName","emitDefaultValues","promise","then","fromJson","ignoreUnknownFields","toBinary","fromBinary","__awaiter","thisArg","_arguments","P","generator","adopt","resolve","Promise","reject","fulfilled","step","next","e","rejected","result","done","apply","__rest","s","t","indexOf","getOwnPropertySymbols","propertyIsEnumerable","core_1","config_1","upload_artifact_1","download_artifact_1","delete_artifact_1","get_artifact_1","list_artifacts_1","errors_1","uploadArtifact","files","rootDirectory","isGhes","GHESNotSupportedError","error","warning","downloadArtifact","findBy","repositoryOwner","repositoryName","token","downloadOptions","downloadArtifactPublic","downloadArtifactInternal","listArtifacts","workflowRunId","listArtifactsPublic","latest","listArtifactsInternal","getArtifact","artifactName","getArtifactPublic","getArtifactInternal","deleteArtifact","deleteArtifactPublic","deleteArtifactInternal","github_1","user_agent_1","retry_options_1","utils_1","plugin_request_log_1","plugin_retry_1","artifact_twirp_client_1","util_1","generated_1","_a","retryOpts","requestOpts","getRetryOptions","defaults","opts","log","userAgent","getUserAgentString","previews","retry","github","getOctokit","requestLog","getArtifactResp","deleteArtifactResp","rest","actions","owner","repo","artifact_id","artifact","id","status","InvalidResponseError","headers","artifactClient","internalArtifactTwirpClient","getBackendIdsFromToken","listReq","listRes","ArtifactNotFoundError","sort","a","b","debug","req","res","info","__setModuleDefault","v","__importStar","mod","__importDefault","default","streamExtractExternal","promises_1","crypto","stream","core","httpClient","unzip_stream_1","scrubQueryParameters","url","parsed","URL","search","exists","path","access","code","streamExtract","directory","retryCount","setTimeout","HttpClient","response","statusCode","statusMessLine truncated
+{"version":3,"file":"index.js","names":["__createBinding","this","Object","create","o","m","k","k2","undefined","desc","getOwnPropertyDescriptor","__esModule","writable","configurable","enumerable","get","defineProperty","__exportStar","exports","p","prototype","hasOwnProperty","call","value","client_1","__webpack_require__","client","DefaultArtifactClient","Timestamp","runtime_1","runtime_2","runtime_3","runtime_4","runtime_5","runtime_6","runtime_7","Timestamp$Type","MessageType","constructor","super","no","name","kind","T","now","msg","ms","Date","seconds","PbLong","from","Math","floor","toString","nanos","toDate","message","toNumber","ceil","fromDate","date","getTime","internalJsonWrite","options","parse","Error","z","nanosStr","substring","toISOString","replace","internalJsonRead","json","target","typeofJsonValue","matches","match","Number","isNaN","globalThis","parseInt","repeat","length","MESSAGE_TYPE","reflectionMergePartial","internalBinaryRead","reader","end","pos","fieldNo","wireType","tag","int64","int32","u","readUnknownField","typeName","d","skip","UnknownFieldHandler","onRead","internalBinaryWrite","writer","WireType","Varint","writeUnknownFields","onWrite","BytesValue","StringValue","BoolValue","UInt32Value","Int32Value","UInt64Value","Int64Value","FloatValue","DoubleValue","DoubleValue$Type","refJsonWriter","scalar","refJsonReader","double","Bit64","FloatValue$Type","float","Bit32","Int64Value$Type","ScalarType","INT64","LongType","STRING","UInt64Value$Type","UINT64","uint64","Int32Value$Type","UInt32Value$Type","uint32","BoolValue$Type","bool","StringValue$Type","string","LengthDelimited","BytesValue$Type","Uint8Array","bytes","ArtifactService","DeleteArtifactResponse","DeleteArtifactRequest","GetSignedArtifactURLResponse","GetSignedArtifactURLRequest","ListArtifactsResponse_MonolithArtifact","ListArtifactsResponse","ListArtifactsRequest","FinalizeArtifactResponse","FinalizeArtifactRequest","CreateArtifactResponse","CreateArtifactRequest","FinalizeMigratedArtifactResponse","FinalizeMigratedArtifactRequest","MigrateArtifactResponse","MigrateArtifactRequest","runtime_rpc_1","wrappers_1","wrappers_2","timestamp_1","MigrateArtifactRequest$Type","workflowRunBackendId","expiresAt","fork","join","MigrateArtifactResponse$Type","ok","signedUploadUrl","FinalizeMigratedArtifactRequest$Type","size","FinalizeMigratedArtifactResponse$Type","artifactId","CreateArtifactRequest$Type","workflowJobRunBackendId","version","CreateArtifactResponse$Type","FinalizeArtifactRequest$Type","hash","FinalizeArtifactResponse$Type","ListArtifactsRequest$Type","nameFilter","idFilter","ListArtifactsResponse$Type","artifacts","push","i","ListArtifactsResponse_MonolithArtifact$Type","databaseId","createdAt","digest","GetSignedArtifactURLRequest$Type","GetSignedArtifactURLResponse$Type","signedUrl","DeleteArtifactRequest$Type","DeleteArtifactResponse$Type","ServiceType","I","O","ArtifactServiceClientProtobuf","ArtifactServiceClientJSON","artifact_1","rpc","CreateArtifact","bind","FinalizeArtifact","ListArtifacts","GetSignedArtifactURL","DeleteArtifact","request","data","toJson","useProtoFieldName","emitDefaultValues","promise","then","fromJson","ignoreUnknownFields","toBinary","fromBinary","__awaiter","thisArg","_arguments","P","generator","adopt","resolve","Promise","reject","fulfilled","step","next","e","rejected","result","done","apply","__rest","s","t","indexOf","getOwnPropertySymbols","propertyIsEnumerable","core_1","config_1","upload_artifact_1","download_artifact_1","delete_artifact_1","get_artifact_1","list_artifacts_1","errors_1","uploadArtifact","files","rootDirectory","isGhes","GHESNotSupportedError","error","warning","downloadArtifact","findBy","repositoryOwner","repositoryName","token","downloadOptions","downloadArtifactPublic","downloadArtifactInternal","listArtifacts","workflowRunId","listArtifactsPublic","latest","listArtifactsInternal","getArtifact","artifactName","getArtifactPublic","getArtifactInternal","deleteArtifact","deleteArtifactPublic","deleteArtifactInternal","github_1","user_agent_1","retry_options_1","utils_1","plugin_request_log_1","plugin_retry_1","artifact_twirp_client_1","util_1","generated_1","_a","retryOpts","requestOpts","getRetryOptions","defaults","opts","log","userAgent","getUserAgentString","previews","retry","github","getOctokit","requestLog","getArtifactResp","deleteArtifactResp","rest","actions","owner","repo","artifact_id","artifact","id","status","InvalidResponseError","headers","artifactClient","internalArtifactTwirpClient","getBackendIdsFromToken","listReq","listRes","ArtifactNotFoundError","sort","a","b","debug","req","res","info","__setModuleDefault","v","__importStar","mod","__importDefault","default","streamExtractExternal","promises_1","crypto","stream","core","httpClient","unzip_stream_1","scrubQueryParameters","url","parsed","URL","search","exists","path","access","code","streamExtract","directory","retryCount","setTimeout","HttpClient","response","statusCode","statusMessLine truncated

src/meta.ts

@@ -169,7 +169,7 @@ export class Meta {
       if (!tmatch) {
         core.warning(`${tag.attrs['match']} does not match ${vraw}.`);
       } else {
-        vraw = this.setValue(tmatch[1], tag);
+        vraw = tmatch[1];
       }
     }
 
@@ -207,8 +207,20 @@ export class Meta {
     if (tag.attrs['value'].length > 0) {
       vraw = this.setGlobalExp(tag.attrs['value']);
     } else {
-      vraw = this.context.ref.replace(/^refs\/tags\//g, '').replace(/\//g, '-');
+      vraw = this.context.ref.replace(/^refs\/tags\//g, '');
     }
+
+    if (tag.attrs['match'].length > 0) {
+      const tmatch = vraw.match(tag.attrs['match']);
+      if (!tmatch) {
+        core.warning(`${tag.attrs['match']} does not match ${vraw}.`);
+      } else {
+        vraw = tmatch[1];
+      }
+    }
+
+    vraw = vraw.replace(/\//g, '-');
+
     if (!pep440.valid(vraw)) {
       core.warning(`${vraw} does not conform to PEP 440. More info: https://www.python.org/dev/peps/pep-0440`);
       return version;