From f962a5a85d9c67556d0d93902792d1e4ee3f8351 Mon Sep 17 00:00:00 2001 From: Bjorn Pijnacker Date: Fri, 19 Sep 2025 23:04:50 +0200 Subject: [PATCH 01/17] ci: semantic-release --- .gitea/workflows/release.yml | 30 ++++++++++++++++++++++++++++++ .releaserc.json | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 .gitea/workflows/release.yml create mode 100644 .releaserc.json diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml new file mode 100644 index 0000000..1f7ba55 --- /dev/null +++ b/.gitea/workflows/release.yml @@ -0,0 +1,30 @@ +name: Release +on: [workflow_dispatch] + +permissions: + contents: read # for checkout + +jobs: + release: + name: Release + runs-on: ubuntu-latest + permissions: + contents: write # to be able to publish a GitHub release + issues: write # to be able to comment on released issues + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: "lts/*" + + - name: Setup semantic-release packages + run: npm install -D @semantic-release/commit-analyzer @semantic-release/release-notes-generator @semantic-release/exec @semantic-release/git @semantic-release/github + + - name: Release + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + run: npx semantic-release diff --git a/.releaserc.json b/.releaserc.json new file mode 100644 index 0000000..a073c78 --- /dev/null +++ b/.releaserc.json @@ -0,0 +1,36 @@ +{ + "branches": [ + "main" + ], + "plugins": [ + "@semantic-release/commit-analyzer", + "@semantic-release/release-notes-generator", + [ + "@semantic-release/exec", + { + "prepareCmd": "jq '.version = \"${nextRelease.version}\"' src/info.json > src/info.json.tmp && mv src/info.json.tmp src/info.json" + } + ], + [ + "@semantic-release/exec", + { + "prepareCmd": "cd src && zip -r ../prometheus-exporter_${nextRelease.version}.zip ." + } + ], + [ + "@semantic-release/git", + { + "assets": [ + "src/info.json" + ], + "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}" + } + ], + "@semantic-release/github", + { + "assets": [ + "prometheus-exporter_*.zip" + ] + } + ] +} \ No newline at end of file -- 2.49.1 From 8ab72fcdebd966dd14b1a113a7fa43aacbd03b22 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Fri, 19 Sep 2025 21:12:45 +0000 Subject: [PATCH 02/17] chore(release): 1.0.0 [skip ci] # 1.0.0 (2025-09-19) ### Bug Fixes * **prometheus-exporter:** fix metric naming to be consistent with prometheus reqs ([431b73e](http://gitea:3000/bjorn/factorio-prometheus-exporter/commit/431b73ee2dd7b3d78076a4eda6af813072f18678)) ### Features * expose production/consumption metrics as metrics.prom ([8a91112](http://gitea:3000/bjorn/factorio-prometheus-exporter/commit/8a911129f68eef90db974abcb8be9b059e5567c3)) * **prometheus-exporter:** add metrics-pole for power metrics ([25026b2](http://gitea:3000/bjorn/factorio-prometheus-exporter/commit/25026b2e732cb8a1074e8d8f73edf576565f3b9e)) --- src/info.json | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/info.json b/src/info.json index fb5d20f..8f58ca9 100644 --- a/src/info.json +++ b/src/info.json @@ -1,9 +1,11 @@ { - "name": "prometheus-exporter", - "version": "0.0.1", - "title": "Prometheus Exporter for Factorio", - "author": "Bjorn Pijnacker", - "factorio_version": "2.0", - "dependencies": ["base >= 2.0"], - "description": "Exports certain production and consumption metrics to Prometheus format, to be used by Prometheus/Grafana monitoring stack" -} \ No newline at end of file + "name": "prometheus-exporter", + "version": "1.0.0", + "title": "Prometheus Exporter for Factorio", + "author": "Bjorn Pijnacker", + "factorio_version": "2.0", + "dependencies": [ + "base >= 2.0" + ], + "description": "Exports certain production and consumption metrics to Prometheus format, to be used by Prometheus/Grafana monitoring stack" +} -- 2.49.1 From 159518b08c6c184fb4bd95816d20fba6e49ea017 Mon Sep 17 00:00:00 2001 From: Bjorn Pijnacker Date: Fri, 19 Sep 2025 23:34:03 +0200 Subject: [PATCH 03/17] ci: try with commit-and-tag-version --- .gitea/workflows/release.yml | 10 ++-------- .releaserc.json | 36 ------------------------------------ .versionrc.json | 8 ++++++++ src/info.json | 4 ++-- 4 files changed, 12 insertions(+), 46 deletions(-) delete mode 100644 .releaserc.json create mode 100644 .versionrc.json diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 1f7ba55..f2081e3 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -20,11 +20,5 @@ jobs: with: node-version: "lts/*" - - name: Setup semantic-release packages - run: npm install -D @semantic-release/commit-analyzer @semantic-release/release-notes-generator @semantic-release/exec @semantic-release/git @semantic-release/github - - - name: Release - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - run: npx semantic-release + - name: Run commit and tag + run: npx commit-and-tag-version diff --git a/.releaserc.json b/.releaserc.json deleted file mode 100644 index a073c78..0000000 --- a/.releaserc.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "branches": [ - "main" - ], - "plugins": [ - "@semantic-release/commit-analyzer", - "@semantic-release/release-notes-generator", - [ - "@semantic-release/exec", - { - "prepareCmd": "jq '.version = \"${nextRelease.version}\"' src/info.json > src/info.json.tmp && mv src/info.json.tmp src/info.json" - } - ], - [ - "@semantic-release/exec", - { - "prepareCmd": "cd src && zip -r ../prometheus-exporter_${nextRelease.version}.zip ." - } - ], - [ - "@semantic-release/git", - { - "assets": [ - "src/info.json" - ], - "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}" - } - ], - "@semantic-release/github", - { - "assets": [ - "prometheus-exporter_*.zip" - ] - } - ] -} \ No newline at end of file diff --git a/.versionrc.json b/.versionrc.json new file mode 100644 index 0000000..da88947 --- /dev/null +++ b/.versionrc.json @@ -0,0 +1,8 @@ +{ + "packageFiles": [ + { + "filename": "src/info.json", + "type": "json" + } + ] +} \ No newline at end of file diff --git a/src/info.json b/src/info.json index 8f58ca9..ba9be30 100644 --- a/src/info.json +++ b/src/info.json @@ -1,6 +1,6 @@ { "name": "prometheus-exporter", - "version": "1.0.0", + "version": "0.0.1", "title": "Prometheus Exporter for Factorio", "author": "Bjorn Pijnacker", "factorio_version": "2.0", @@ -8,4 +8,4 @@ "base >= 2.0" ], "description": "Exports certain production and consumption metrics to Prometheus format, to be used by Prometheus/Grafana monitoring stack" -} +} \ No newline at end of file -- 2.49.1 From de15869ceb5bb78c12f9bcb56f1586cb8a46e5b9 Mon Sep 17 00:00:00 2001 From: Bjorn Pijnacker Date: Sat, 20 Sep 2025 00:00:54 +0200 Subject: [PATCH 04/17] ci: try with commit-and-tag-version v2 --- .gitea/workflows/release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index f2081e3..234f567 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -20,5 +20,8 @@ jobs: with: node-version: "lts/*" + - name: Setup git + run: 'git config --global user.name "CI Bot" && git config --global user.email "ci@bjornp.com"' + - name: Run commit and tag run: npx commit-and-tag-version -- 2.49.1 From c3a7f917a962bac8efc6067f7bcd16ea51cba4bf Mon Sep 17 00:00:00 2001 From: Bjorn Pijnacker Date: Sat, 20 Sep 2025 00:04:31 +0200 Subject: [PATCH 05/17] ci: try with commit-and-tag-version v3 --- .gitea/workflows/release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 234f567..9c600e7 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -25,3 +25,6 @@ jobs: - name: Run commit and tag run: npx commit-and-tag-version + + - name: Publishing release + run: git remote set-url origin https://bjorn:$GITEA_TOKEN@git.bjornp.com/bjorn/factorio-prometheus-exporter.git \&& git push --follow-tags origin main -- 2.49.1 From 8ffaa905941d03f81914264f10de3b075ec53dce Mon Sep 17 00:00:00 2001 From: Bjorn Pijnacker Date: Sat, 20 Sep 2025 09:49:08 +0200 Subject: [PATCH 06/17] ci: test with semantic-release without git --- .gitea/workflows/release.yml | 18 ++++-------------- .releaserc.json | 11 +++++++++++ .versionrc.json | 8 -------- 3 files changed, 15 insertions(+), 22 deletions(-) create mode 100644 .releaserc.json delete mode 100644 .versionrc.json diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 9c600e7..73efac8 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -1,5 +1,6 @@ name: Release -on: [workflow_dispatch] +on: + workflow_dispatch: permissions: contents: read # for checkout @@ -15,16 +16,5 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - node-version: "lts/*" - - - name: Setup git - run: 'git config --global user.name "CI Bot" && git config --global user.email "ci@bjornp.com"' - - - name: Run commit and tag - run: npx commit-and-tag-version - - - name: Publishing release - run: git remote set-url origin https://bjorn:$GITEA_TOKEN@git.bjornp.com/bjorn/factorio-prometheus-exporter.git \&& git push --follow-tags origin main + - name: Determine release version and changelog + run: npx semantic-release diff --git a/.releaserc.json b/.releaserc.json new file mode 100644 index 0000000..910aafa --- /dev/null +++ b/.releaserc.json @@ -0,0 +1,11 @@ +{ + "branches": [ + "main", + "beta" + ], + "plugins": [ + "@semantic-release/commit-analyzer", + "@semantic-release/release-notes-generator" + ], + "publish": false +} \ No newline at end of file diff --git a/.versionrc.json b/.versionrc.json deleted file mode 100644 index da88947..0000000 --- a/.versionrc.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "packageFiles": [ - { - "filename": "src/info.json", - "type": "json" - } - ] -} \ No newline at end of file -- 2.49.1 From be7cb63d992aa6b9793ab6456a00b09e55da41b1 Mon Sep 17 00:00:00 2001 From: Bjorn Pijnacker Date: Sat, 20 Sep 2025 10:09:38 +0200 Subject: [PATCH 07/17] chore(release): 0.0.2 --- CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..00ed187 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,16 @@ +# Changelog + +All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines. + +## 0.0.2 (2025-09-20) + + +### Features + +* expose production/consumption metrics as metrics.prom ([8a91112](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/8a911129f68eef90db974abcb8be9b059e5567c3)) +* **prometheus-exporter:** add metrics-pole for power metrics ([25026b2](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/25026b2e732cb8a1074e8d8f73edf576565f3b9e)) + + +### Bug Fixes + +* **prometheus-exporter:** fix metric naming to be consistent with prometheus reqs ([431b73e](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/431b73ee2dd7b3d78076a4eda6af813072f18678)) -- 2.49.1 From a661e1544331bdf3b1ed30646d0e8e1d76855ea4 Mon Sep 17 00:00:00 2001 From: Bjorn Pijnacker Date: Sat, 20 Sep 2025 10:12:01 +0200 Subject: [PATCH 08/17] chore(release): 0.0.2 --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00ed187..a1ebf62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,19 @@ All notable changes to this project will be documented in this file. See [commit * **prometheus-exporter:** add metrics-pole for power metrics ([25026b2](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/25026b2e732cb8a1074e8d8f73edf576565f3b9e)) +### Bug Fixes + +* **prometheus-exporter:** fix metric naming to be consistent with prometheus reqs ([431b73e](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/431b73ee2dd7b3d78076a4eda6af813072f18678)) + +## 0.0.2 (2025-09-20) + + +### Features + +* expose production/consumption metrics as metrics.prom ([8a91112](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/8a911129f68eef90db974abcb8be9b059e5567c3)) +* **prometheus-exporter:** add metrics-pole for power metrics ([25026b2](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/25026b2e732cb8a1074e8d8f73edf576565f3b9e)) + + ### Bug Fixes * **prometheus-exporter:** fix metric naming to be consistent with prometheus reqs ([431b73e](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/431b73ee2dd7b3d78076a4eda6af813072f18678)) -- 2.49.1 From 50b0c9ad6e2b5d00c855f896791b72b4b17d21c1 Mon Sep 17 00:00:00 2001 From: Bjorn Pijnacker Date: Sat, 20 Sep 2025 10:12:09 +0200 Subject: [PATCH 09/17] chore(release): 1.0.0 --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1ebf62..d5b7fd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,19 @@ All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines. +## 1.0.0 (2025-09-20) + + +### Features + +* expose production/consumption metrics as metrics.prom ([8a91112](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/8a911129f68eef90db974abcb8be9b059e5567c3)) +* **prometheus-exporter:** add metrics-pole for power metrics ([25026b2](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/25026b2e732cb8a1074e8d8f73edf576565f3b9e)) + + +### Bug Fixes + +* **prometheus-exporter:** fix metric naming to be consistent with prometheus reqs ([431b73e](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/431b73ee2dd7b3d78076a4eda6af813072f18678)) + ## 0.0.2 (2025-09-20) -- 2.49.1 From be6241f873a519901b97834fb66f0ee0f8b2edf6 Mon Sep 17 00:00:00 2001 From: Bjorn Pijnacker Date: Sat, 20 Sep 2025 10:12:17 +0200 Subject: [PATCH 10/17] chore(release): 1.0.0 --- CHANGELOG.md | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d5b7fd8..98c53b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,41 +2,3 @@ All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines. -## 1.0.0 (2025-09-20) - - -### Features - -* expose production/consumption metrics as metrics.prom ([8a91112](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/8a911129f68eef90db974abcb8be9b059e5567c3)) -* **prometheus-exporter:** add metrics-pole for power metrics ([25026b2](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/25026b2e732cb8a1074e8d8f73edf576565f3b9e)) - - -### Bug Fixes - -* **prometheus-exporter:** fix metric naming to be consistent with prometheus reqs ([431b73e](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/431b73ee2dd7b3d78076a4eda6af813072f18678)) - -## 0.0.2 (2025-09-20) - - -### Features - -* expose production/consumption metrics as metrics.prom ([8a91112](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/8a911129f68eef90db974abcb8be9b059e5567c3)) -* **prometheus-exporter:** add metrics-pole for power metrics ([25026b2](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/25026b2e732cb8a1074e8d8f73edf576565f3b9e)) - - -### Bug Fixes - -* **prometheus-exporter:** fix metric naming to be consistent with prometheus reqs ([431b73e](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/431b73ee2dd7b3d78076a4eda6af813072f18678)) - -## 0.0.2 (2025-09-20) - - -### Features - -* expose production/consumption metrics as metrics.prom ([8a91112](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/8a911129f68eef90db974abcb8be9b059e5567c3)) -* **prometheus-exporter:** add metrics-pole for power metrics ([25026b2](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/25026b2e732cb8a1074e8d8f73edf576565f3b9e)) - - -### Bug Fixes - -* **prometheus-exporter:** fix metric naming to be consistent with prometheus reqs ([431b73e](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/431b73ee2dd7b3d78076a4eda6af813072f18678)) -- 2.49.1 From 47211289147e258f3b46f6477bdd2efd491dcf4e Mon Sep 17 00:00:00 2001 From: Bjorn Pijnacker Date: Sat, 20 Sep 2025 10:12:52 +0200 Subject: [PATCH 11/17] chore(release): 1.0.0 --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 98c53b6..819544b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,3 +2,15 @@ All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines. +## 1.0.0 (2025-09-20) + + +### Features + +* expose production/consumption metrics as metrics.prom ([8a91112](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/8a911129f68eef90db974abcb8be9b059e5567c3)) +* **prometheus-exporter:** add metrics-pole for power metrics ([25026b2](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/25026b2e732cb8a1074e8d8f73edf576565f3b9e)) + + +### Bug Fixes + +* **prometheus-exporter:** fix metric naming to be consistent with prometheus reqs ([431b73e](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/431b73ee2dd7b3d78076a4eda6af813072f18678)) -- 2.49.1 From dcbd133e7f0e3e41cee3d6b77f8a2db83d249546 Mon Sep 17 00:00:00 2001 From: Bjorn Pijnacker Date: Sat, 20 Sep 2025 10:13:51 +0200 Subject: [PATCH 12/17] chore(release): 1.0.0 --- src/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/info.json b/src/info.json index ba9be30..8f58ca9 100644 --- a/src/info.json +++ b/src/info.json @@ -1,6 +1,6 @@ { "name": "prometheus-exporter", - "version": "0.0.1", + "version": "1.0.0", "title": "Prometheus Exporter for Factorio", "author": "Bjorn Pijnacker", "factorio_version": "2.0", @@ -8,4 +8,4 @@ "base >= 2.0" ], "description": "Exports certain production and consumption metrics to Prometheus format, to be used by Prometheus/Grafana monitoring stack" -} \ No newline at end of file +} -- 2.49.1 From b0ca2a26a1d07ce274948da109b606b3fa787fab Mon Sep 17 00:00:00 2001 From: Bjorn Pijnacker Date: Sat, 20 Sep 2025 10:26:10 +0200 Subject: [PATCH 13/17] ci: test with release action --- .gitea/workflows/release.yml | 32 ++++++++++++++++++++++++++++---- .releaserc.json | 11 ----------- .versionrc.json | 8 ++++++++ CHANGELOG.md | 16 ---------------- 4 files changed, 36 insertions(+), 31 deletions(-) delete mode 100644 .releaserc.json create mode 100644 .versionrc.json diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 73efac8..ee86333 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -2,9 +2,6 @@ name: Release on: workflow_dispatch: -permissions: - contents: read # for checkout - jobs: release: name: Release @@ -16,5 +13,32 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Prepare git + run: | + git config --global user.email "gitea@bjornp.com" + git config --global user.name "gitea-actions" + - name: Determine release version and changelog - run: npx semantic-release + run: npx commit-and-tag-version + + - name: Build release + working-directory: src + run: | + VERSION=$(jq '.version' info.json | xargs echo -n) + zip -r ../prometheus-exporter_$VERSION.zip . + + - name: Push changelog and tag + run: git push --follow-tags + + - name: Get latest tag + id: tag + run: echo tag="$(git describe --tags --abbrev=0)" >> $GITHUB_OUTPUT + + - name: Create release + uses: akkuman/gitea-release-action@v1 + with: + files: prometheus-exporter_*.zip + body_path: CHANGELOG.md + name: ${{ steps.tag.outputs.tag }} + tag_name: ${{ steps.tag.outputs.tag }} + md5sum: true diff --git a/.releaserc.json b/.releaserc.json deleted file mode 100644 index 910aafa..0000000 --- a/.releaserc.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "branches": [ - "main", - "beta" - ], - "plugins": [ - "@semantic-release/commit-analyzer", - "@semantic-release/release-notes-generator" - ], - "publish": false -} \ No newline at end of file diff --git a/.versionrc.json b/.versionrc.json new file mode 100644 index 0000000..096631f --- /dev/null +++ b/.versionrc.json @@ -0,0 +1,8 @@ +{ + "bumpFiles": [ + { + "filename": "src/info.json", + "type": "json" + } + ] +} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 819544b..e69de29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,16 +0,0 @@ -# Changelog - -All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines. - -## 1.0.0 (2025-09-20) - - -### Features - -* expose production/consumption metrics as metrics.prom ([8a91112](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/8a911129f68eef90db974abcb8be9b059e5567c3)) -* **prometheus-exporter:** add metrics-pole for power metrics ([25026b2](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/25026b2e732cb8a1074e8d8f73edf576565f3b9e)) - - -### Bug Fixes - -* **prometheus-exporter:** fix metric naming to be consistent with prometheus reqs ([431b73e](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/431b73ee2dd7b3d78076a4eda6af813072f18678)) -- 2.49.1 From 3ec4185f487e94db4df68af2498edec33f76037e Mon Sep 17 00:00:00 2001 From: gitea-actions Date: Sat, 20 Sep 2025 08:41:08 +0000 Subject: [PATCH 14/17] chore(release): 1.0.1 --- .gitea/workflows/release.yml | 8 ++++++-- CHANGELOG.md | 30 ++++++++++++++++++++++++++++++ src/info.json | 2 +- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index ee86333..02042d9 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -30,9 +30,13 @@ jobs: - name: Push changelog and tag run: git push --follow-tags - - name: Get latest tag + - name: Get latest tag and changelog fragment id: tag - run: echo tag="$(git describe --tags --abbrev=0)" >> $GITHUB_OUTPUT + run: | + echo tag="$(git describe --tags --abbrev=0)" >> $GITHUB_OUTPUT + echo "changelog<> $GITHUB_OUTPUT + awk '/^## / { if (version_found) exit; version_found=1 } version_found { print }' CHANGELOG.md | sed '1d' >> $GITHUB_OUTPUT + echo "EOF" >> $GITHUB_OUTPUT - name: Create release uses: akkuman/gitea-release-action@v1 diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29..9737372 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1,30 @@ +# Changelog + +All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines. + +## 1.1.0 (2025-09-20) + + +### Features + +* expose production/consumption metrics as metrics.prom ([8a91112](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/8a911129f68eef90db974abcb8be9b059e5567c3)) +* **prometheus-exporter:** add metrics-pole for power metrics ([25026b2](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/25026b2e732cb8a1074e8d8f73edf576565f3b9e)) + + +### Bug Fixes + +* **prometheus-exporter:** fix metric naming to be consistent with prometheus reqs ([431b73e](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/431b73ee2dd7b3d78076a4eda6af813072f18678)) + +## 1.1.0 (2025-09-20) + + +### Features + +* expose production/consumption metrics as metrics.prom ([8a91112](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/8a911129f68eef90db974abcb8be9b059e5567c3)) +* **prometheus-exporter:** add metrics-pole for power metrics ([25026b2](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/25026b2e732cb8a1074e8d8f73edf576565f3b9e)) + + +### Bug Fixes + +* **prometheus-exporter:** fix metric naming to be consistent with prometheus reqs ([431b73e](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/431b73ee2dd7b3d78076a4eda6af813072f18678)) + diff --git a/src/info.json b/src/info.json index 8f58ca9..eba1d8b 100644 --- a/src/info.json +++ b/src/info.json @@ -8,4 +8,4 @@ "base >= 2.0" ], "description": "Exports certain production and consumption metrics to Prometheus format, to be used by Prometheus/Grafana monitoring stack" -} +} \ No newline at end of file -- 2.49.1 From 1abdab47b4e6fb6c0496715d2d8923962655523d Mon Sep 17 00:00:00 2001 From: gitea-actions Date: Sat, 20 Sep 2025 08:51:53 +0000 Subject: [PATCH 15/17] chore(release): 1.0.1 --- CHANGELOG.md | 3 ++- src/info.json | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9737372..8c7321c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines. +## 1.0.1 (2025-09-20) + ## 1.1.0 (2025-09-20) @@ -27,4 +29,3 @@ All notable changes to this project will be documented in this file. See [commit ### Bug Fixes * **prometheus-exporter:** fix metric naming to be consistent with prometheus reqs ([431b73e](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/431b73ee2dd7b3d78076a4eda6af813072f18678)) - diff --git a/src/info.json b/src/info.json index eba1d8b..caf9002 100644 --- a/src/info.json +++ b/src/info.json @@ -1,6 +1,6 @@ { "name": "prometheus-exporter", - "version": "1.0.0", + "version": "1.0.1", "title": "Prometheus Exporter for Factorio", "author": "Bjorn Pijnacker", "factorio_version": "2.0", @@ -8,4 +8,4 @@ "base >= 2.0" ], "description": "Exports certain production and consumption metrics to Prometheus format, to be used by Prometheus/Grafana monitoring stack" -} \ No newline at end of file +} -- 2.49.1 From f658cc9baf83284138af95d65197d3473dd17064 Mon Sep 17 00:00:00 2001 From: Bjorn Pijnacker Date: Sat, 20 Sep 2025 10:53:07 +0200 Subject: [PATCH 16/17] ci: test with release action --- .gitea/workflows/release.yml | 2 +- CHANGELOG.md | 2 -- src/info.json | 4 ++-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 02042d9..65d2b00 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -42,7 +42,7 @@ jobs: uses: akkuman/gitea-release-action@v1 with: files: prometheus-exporter_*.zip - body_path: CHANGELOG.md + body: ${{ steps.tag.outputs.changelog }} name: ${{ steps.tag.outputs.tag }} tag_name: ${{ steps.tag.outputs.tag }} md5sum: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c7321c..b5ed66a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,6 @@ All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines. -## 1.0.1 (2025-09-20) - ## 1.1.0 (2025-09-20) diff --git a/src/info.json b/src/info.json index caf9002..eba1d8b 100644 --- a/src/info.json +++ b/src/info.json @@ -1,6 +1,6 @@ { "name": "prometheus-exporter", - "version": "1.0.1", + "version": "1.0.0", "title": "Prometheus Exporter for Factorio", "author": "Bjorn Pijnacker", "factorio_version": "2.0", @@ -8,4 +8,4 @@ "base >= 2.0" ], "description": "Exports certain production and consumption metrics to Prometheus format, to be used by Prometheus/Grafana monitoring stack" -} +} \ No newline at end of file -- 2.49.1 From ada87e68661f80ffe2591bb4ef5893565e3460e7 Mon Sep 17 00:00:00 2001 From: gitea-actions Date: Sat, 20 Sep 2025 08:53:58 +0000 Subject: [PATCH 17/17] chore(release): 1.0.1 --- CHANGELOG.md | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index b5ed66a..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,29 +0,0 @@ -# Changelog - -All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines. - -## 1.1.0 (2025-09-20) - - -### Features - -* expose production/consumption metrics as metrics.prom ([8a91112](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/8a911129f68eef90db974abcb8be9b059e5567c3)) -* **prometheus-exporter:** add metrics-pole for power metrics ([25026b2](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/25026b2e732cb8a1074e8d8f73edf576565f3b9e)) - - -### Bug Fixes - -* **prometheus-exporter:** fix metric naming to be consistent with prometheus reqs ([431b73e](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/431b73ee2dd7b3d78076a4eda6af813072f18678)) - -## 1.1.0 (2025-09-20) - - -### Features - -* expose production/consumption metrics as metrics.prom ([8a91112](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/8a911129f68eef90db974abcb8be9b059e5567c3)) -* **prometheus-exporter:** add metrics-pole for power metrics ([25026b2](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/25026b2e732cb8a1074e8d8f73edf576565f3b9e)) - - -### Bug Fixes - -* **prometheus-exporter:** fix metric naming to be consistent with prometheus reqs ([431b73e](https://git.bjornp.com/bjorn/factorio-prometheus-exporter/commit/431b73ee2dd7b3d78076a4eda6af813072f18678)) -- 2.49.1