Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add buildpacks for building docker image #764

Merged
merged 1 commit into from
Jul 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 0 additions & 113 deletions .github/workflows/docker.yml

This file was deleted.

34 changes: 19 additions & 15 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,30 @@ on:
branches:
- master

env:
DOCKER_IMAGE_NAME: mergeability/mergeable

jobs:
build:
name: Release
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [20.11.1]

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- run: npm install
- name: Release
- name: Checkout
uses: actions/checkout@v4
- name: Semantic Release
id: semantic
uses: cycjimmy/semantic-release-action@v4
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
run: npx semantic-release
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
if: ${{ steps.semantic.outputs.new_release_version }}
- uses: buildpacks/github-actions/[email protected]
if: ${{ steps.semantic.outputs.new_release_version }}
- name: Build and publish docker image
if: ${{ steps.semantic.outputs.new_release_version }}
run: pack build ${{ env.DOCKER_IMAGE_NAME }} -t ${{ env.DOCKER_IMAGE_NAME }}:${{ steps.semantic.outputs.new_release_version }} -t ${{ env.DOCKER_IMAGE_NAME }}:latest -B paketobuildpacks/builder-jammy-tiny -b docker.io/paketobuildpacks/nodejs --publish
25 changes: 5 additions & 20 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,16 @@
name: CI

on:
push:
branches: ['**']
pull_request:
branches: ['**']

permissions:
contents: read
on: [ push ]
Copy link
Contributor Author

@Ch4s3r Ch4s3r Jun 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was there any reason why two triggers have been used?
As in the last example here they do it via push.


jobs:
build:
name: Tests and Code Coverage
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [20.11.1]

steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- run: npm install
node-version: '20.x'
- run: npm ci
- run: npm run build --if-present
- run: npm run test-coverage
env:
CI: true
- run: npm test
38 changes: 0 additions & 38 deletions Dockerfile

This file was deleted.

1 change: 1 addition & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
CHANGELOG
=====================================
| June 25 2024: feat: Add buildpacks for building docker image `#764 <https://github.com/mergeability/mergeable/pull/764>`_
| June 20, 2024: feat: Add options 'one_of' and 'none_of'. Support in filters `payload`, `author`, and in action `lastComment` to filter comments authors `#757 <https://github.com/mergeability/mergeable/pull/757>`_
| June 20, 2024: feat: Add annotations @sender @bot @repository @action and template helper {{formatDate}} `#756 <https://github.com/mergeability/mergeable/pull/756>`_
| June 20, 2024: fix: Comments on Issues should not trigger `checks` action `#759 <https://github.com/mergeability/mergeable/pull/759>`_
Expand Down
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"standard": "^16.0.3"
},
"engines": {
"node": ">= 18.12.1"
"node": "^20"
},
"standard": {
"env": [
Expand All @@ -58,5 +58,9 @@
"collectCoverageFrom": [
"lib/**/*.js"
]
}
},
"publishConfig": {
"access": "public"
},
"private": false
}