Skip to content

Commit c103c74

Browse files
Merge branch 'main' into dependabot/npm_and_yarn/npm_and_yarn-4265e88a4c
2 parents 0638925 + 007e7c0 commit c103c74

File tree

4 files changed

+32
-2
lines changed

4 files changed

+32
-2
lines changed

.github/workflows/ci.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,28 @@ jobs:
2727

2828
- name: Run tests
2929
run: npm test
30+
31+
32+
dependabot:
33+
name: Dependabot auto-merge
34+
runs-on: ubuntu-latest
35+
needs: lint-and-test
36+
if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'masthead-data/dataform-package'
37+
38+
permissions:
39+
contents: write
40+
pull-requests: write
41+
42+
steps:
43+
- name: Dependabot metadata
44+
id: metadata
45+
uses: dependabot/fetch-metadata@v2
46+
with:
47+
github-token: "${{ secrets.GITHUB_TOKEN }}"
48+
49+
- name: Enable auto-merge for Dependabot PRs
50+
if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor'
51+
run: gh pr merge --auto --squash "$PR_URL"
52+
env:
53+
PR_URL: ${{github.event.pull_request.html_url}}
54+
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
5050
- API documentation
5151
- Best practices guide
5252
- Troubleshooting section
53+
54+
[Unreleased]: https://github.com/masthead-data/dataform-package/compare/v0.1.0...HEAD
55+
[0.1.0]: https://github.com/masthead-data/dataform-package/compare/v0.0.1...v0.1.0
56+
[0.0.1]: https://github.com/masthead-data/dataform-package/tree/v0.0.1

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Masthead Package for Dataform
22

3-
[![npm version](https://badge.fury.io/js/%40masthead-data%2Fdataform-package.svg)](https://badge.fury.io/js/%40masthead-data%2Fdataform-package)
3+
![NPM Version](https://img.shields.io/npm/v/%40masthead-data%2Fdataform-package)
44

55
## Overview
66

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"test": "jest && cd test-project && npm ci && npx @dataform/cli compile --json",
88
"test:watch": "jest --watch",
99
"lint": "eslint -c .github/linters/eslint.config.mjs .",
10-
"lint:fix": "eslint -c .github/linters/eslint.config.mjs --fix ."
10+
"lint:fix": "eslint -c .github/linters/eslint.config.mjs --fix .",
11+
"release": "node -e \"const v = process.env.npm_config_version; if (!v) { console.error('Error: version parameter is required. Use: npm run release --version=x.y.z'); process.exit(1); } const { execSync } = require('child_process'); execSync(`git tag -a v${v} -m 'Release v${v}'`, { stdio: 'inherit' }); execSync(`git push origin v${v}`, { stdio: 'inherit' }); console.log(`✓ Successfully added a tag v${v}`);\""
1112
},
1213
"keywords": [
1314
"dataform",

0 commit comments

Comments
 (0)