Skip to content

Commit

Permalink
Merge pull request #6 from deeagle/dev/task_update-ci-versions
Browse files Browse the repository at this point in the history
Dev/task update ci versions
  • Loading branch information
deeagle authored Jan 9, 2023
2 parents b965c13 + 4055700 commit 4c182f7
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 16 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,23 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Lint readme file
uses: avto-dev/markdown-lint@v1
with:
#rules: '/lint/rules/changelog.js'
#config: '/lint/config/changelog.yml'
args: 'README.md'
args: '*.md'
ignore: 'CHANGELOG.md'

lint-dockerfile:
name: Lint Dockerfile
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@main
uses: actions/checkout@v3
- name: Lint dockerfile
uses: hadolint/hadolint-action@v2.0.0
uses: hadolint/hadolint-action@v3.0.0
with:
dockerfile: Dockerfile
6 changes: 3 additions & 3 deletions .github/workflows/release-tst.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@main
uses: actions/checkout@v3

- name: Setup Nodejs
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: "16"
node-version: 18

- name: Install dependencies
run: npm install @semantic-release/changelog @semantic-release/git @semantic-release/changelog @semantic-release/commit-analyzer @semantic-release/exec @semantic-release/git semantic-release/release-notes-generator
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
app_version: ${{ steps.step1.outputs.app_version }}
steps:
- name: Checkout code
uses: actions/checkout@main
uses: actions/checkout@v3

- name: Setup Nodejs
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: '16'
node-version: 18

- name: Install dependencies
run: npm install @semantic-release/changelog @semantic-release/git @semantic-release/changelog @semantic-release/commit-analyzer @semantic-release/exec @semantic-release/git semantic-release/release-notes-generator
Expand All @@ -36,28 +36,28 @@ jobs:
run: |
APP_VERSION=$(git describe --tags $(git rev-list --tags --max-count=1))
echo "${APP_VERSION}"
echo "::set-output name=app_version::${APP_VERSION}"
echo "name=app_version::${APP_VERSION}" >> ${GITHUB_OUTPUT}
docker-hub:
needs: release
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@main
uses: actions/checkout@v3

- name: show app_version from release job
run: echo ${{ needs.release.outputs.app_version }}

- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v4
with:
images: docdee/xmllint
tags: |
Expand All @@ -66,7 +66,7 @@ jobs:
type=raw,value=latest
- name: Build and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: .
file: ./Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
![Build status](https://github.com/deeagle/xmllint-container/workflows/Release%20version/badge.svg)
[![Linux](https://svgshare.com/i/Zhy.svg)](https://svgshare.com/i/Zhy.svg)
[![Alpine](https://img.shields.io/badge/Alpine_Linux-0D597F?style=flat-square&logo=alpine-linux&logoColor=white)](https://img.shields.io/badge/Alpine_Linux-0D597F?style=flat-square&logo=alpine-linux&logoColor=white)
[![Docker](https://badgen.net/badge/icon/docker?icon=docker&label)](https://hub.docker.com/r/docdee/xmllint)

Container includes semantic-release to gitea for CI.
Installed tools are:
Expand All @@ -24,4 +25,3 @@ You can check your xml against:
## Weblinks

- [CHANGELOG](CHANGELOG.md)
- [xmllint-container on hub.docker.com](https://hub.docker.com/r/docdee/xmllint)

0 comments on commit 4c182f7

Please sign in to comment.