Skip to content

Commit

Permalink
Revert "feat: pre-build dockerfile (#201)"
Browse files Browse the repository at this point in the history
This reverts commit 60b1f44.
  • Loading branch information
sammcj committed Dec 5, 2022
1 parent 60b1f44 commit 59a186f
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 133 deletions.
10 changes: 0 additions & 10 deletions .dockerignore

This file was deleted.

77 changes: 0 additions & 77 deletions .github/workflows/build-docker-image.yml

This file was deleted.

14 changes: 4 additions & 10 deletions .github/workflows/lint.yml
@@ -1,7 +1,6 @@
name: Lint

on:
workflow_dispatch:
pull_request:
types:
- opened
Expand All @@ -17,7 +16,7 @@ permissions:
jobs:
lint-bash:
name: Lint Bash scripts
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: reviewdog/action-shellcheck@v1
Expand All @@ -26,12 +25,12 @@ jobs:
reporter: github-pr-review
level: warning
path: .
pattern: "*.sh"
pattern: '*.sh'
fail_on_error: true

lint-dockerfile:
name: Lint Dockerfiles
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: hadolint
Expand All @@ -43,7 +42,7 @@ jobs:
hadolint_ignore: DL3016 DL3018 # Ignore pinning apk and npm packages to specific version with @

lint-actions:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Lint Github Actions
Expand All @@ -53,8 +52,3 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
reporter: github-pr-review
github_token: ${{ secrets.GITHUB_TOKEN }}
tool_name: actionlint
level: warning
fail_on_error: true
filter_mode: added
6 changes: 2 additions & 4 deletions .github/workflows/main.yml
@@ -1,7 +1,6 @@
name: Bump version

on:
workflow_dispatch:
pull_request:
types:
- closed
Expand All @@ -15,8 +14,7 @@ jobs:
steps:
- uses: actions/checkout@v3
with:
fetch-depth: "0"
ref: ${{ github.ref_name }}
fetch-depth: '0'

- name: version-tag
id: tag
Expand Down Expand Up @@ -48,4 +46,4 @@ jobs:
git push -f origin "$major"
# add vX as 1 is linked to short sha bug https://github.com/anothrNick/github-tag-action/actions/runs/3139501775/jobs/5099976842#step:1:35
git tag -f "v$major"
git push -f origin "v$major"
git push -f origin "v$major"
7 changes: 3 additions & 4 deletions .github/workflows/test.yml
Expand Up @@ -2,7 +2,6 @@ name: Test
# This workflow tests the tag action and can be used on PRs to detect (some) breaking changes.

on:
workflow_dispatch:
pull_request:
types:
- opened
Expand All @@ -14,17 +13,16 @@ permissions:
pull-requests: write
checks: write
contents: read
packages: read

jobs:
test-action:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: "0"
fetch-depth: '0'

# Use the action to generate a tag for itself
- name: Test action main
Expand Down Expand Up @@ -88,3 +86,4 @@ jobs:
fi
# todo add test for #none bump
14 changes: 8 additions & 6 deletions Dockerfile
@@ -1,8 +1,10 @@
# hadolint ignore=DL3007
FROM ghcr.io/anothrnick/github-tag-action:latest

LABEL "repository"="https://github.com/anothrnick/github-tag-action"
LABEL "homepage"="https://github.com/anothrnick/github-tag-action"
FROM node:16-alpine
LABEL "repository"="https://github.com/anothrNick/github-tag-action"
LABEL "homepage"="https://github.com/anothrNick/github-tag-action"
LABEL "maintainer"="Nick Sjostrom"

# This Dockerfile is empty, it simply pulls a prebuilt image to speed up the Action.
RUN apk --no-cache add bash git curl jq && npm install -g semver

COPY entrypoint.sh /entrypoint.sh

ENTRYPOINT ["/entrypoint.sh"]
20 changes: 10 additions & 10 deletions action.yml
@@ -1,16 +1,16 @@
name: "Github Tag Bump"
description: "Bump and push git tag on merge"
author: "Nick Sjostrom"
name: 'Github Tag Bump'
description: 'Bump and push git tag on merge'
author: 'Nick Sjostrom'
runs:
using: "docker"
image: "Dockerfile"
using: 'docker'
image: 'Dockerfile'
outputs:
new_tag:
description: "Generated tag"
description: 'Generated tag'
tag:
description: "The latest tag after running this action"
description: 'The latest tag after running this action'
part:
description: "The part of version which was bumped"
description: 'The part of version which was bumped'
branding:
icon: "git-merge"
color: "purple"
icon: 'git-merge'
color: 'purple'
12 changes: 0 additions & 12 deletions prebuild.Dockerfile

This file was deleted.

0 comments on commit 59a186f

Please sign in to comment.