Skip to content

Commit

Permalink
use version tags instead sha caboose; some cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
2bndy5 committed Jul 5, 2020
1 parent 9f4b5f6 commit 37fae88
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 9 deletions.
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ COPY enter_rmskin_builder.sh /enter_rmskin_builder.sh
COPY release.py /rmskin_builder.py
COPY requirements.txt /reqs.txt
RUN chmod +x /enter_rmskin_builder.sh
# RUN ls

# Code file to execute when the docker container starts up (`enter_rmskin_builder.sh`)
ENTRYPOINT ["/enter_rmskin_builder.sh"]
2 changes: 1 addition & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ branding:
# required: false
outputs:
arc_name: # path to & name of archive file that was generated
description: 'path Filename of rmskin file'
description: 'name of rmskin file'
runs:
using: 'docker'
image: 'Dockerfile'
Expand Down
10 changes: 3 additions & 7 deletions release.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
metavar='"STR"',
type=str,
default=os.getenv("GITHUB_SHA", "x0x.x0x/")[-8:]
if os.getenv("GITHUB_REF", "").startswith("refs/")
else os.getenv("GITHUB_REF", "0.0"),
if not os.getenv("GITHUB_REF", "").startswith("refs/tags/")
else os.getenv("GITHUB_REF", "refs/tags/0.0").replace("refs/tags/", ""),
help="Version of release. This should be the github action env var (GITHUB_REF or last 8 digits of GITHUB_SHA).",
)
parser.add_argument(
Expand Down Expand Up @@ -224,11 +224,7 @@ def main():
arc_file.write(custom_footer)

print("Archive successfully prepared.")
print(
"::set-output name=arc_name::{}".format(
arc_name + "_" + version + ".rmskin"
)
)
print("::set-output name=arc_name::{}".format(arc_name + "_" + version + ".rmskin"))


if __name__ == "__main__":
Expand Down

0 comments on commit 37fae88

Please sign in to comment.