Skip to content

Commit

Permalink
Merge pull request #362 from refinedmods/release/2.0.0-milestone.2.9
Browse files Browse the repository at this point in the history
Release v2.0.0-milestone.2.9
  • Loading branch information
raoulvdberge authored Mar 31, 2023
2 parents 60ed020 + 8b6d7c1 commit 59fdad9
Show file tree
Hide file tree
Showing 244 changed files with 4,398 additions and 1,048 deletions.
9 changes: 4 additions & 5 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Contributing to Refined Storage
# Contributing

When contributing to this repository, please first discuss the change you wish to make via
[GitHub issues](https://github.com/refinedmods/refinedstorage2/issues), [Discord](https://discordapp.com/invite/VYzsydb),
Expand Down Expand Up @@ -48,8 +48,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

### Version metadata

The code doesn't contain version metadata: `build.gradle` specifies a version of `0.0.0`. The versioning information is
entirely contained in Git by using tags.
The code doesn't contain version metadata: `build.gradle` specifies a version of `0.0.0` (via Refined Architect).
The versioning information is entirely contained in Git by using tags.

Per [Semantic Versioning](https://semver.org/spec/v2.0.0.html), the version number being released depends on the changes
in that release. We usually can't predict those
Expand All @@ -64,8 +64,7 @@ release cycle of the new version, which isn't correct.

Whenever we port to a new Minecraft version, at least the minor version should be incremented.

This is needed so that we can still support older Minecraft versions without the Refined Storage version numbers
conflicting.
This is needed so that we can still support older Minecraft versions without the version numbers conflicting.

## Changelog

Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ body:
validations:
required: true
- type: input
id: rs
id: version
attributes:
label: What Refined Storage version is this happening on?
description: |
Ensure that you are running on the latest Refined Storage version.
Ensure that you are using the latest version.
validations:
required: true
- type: textarea
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/enhancement.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Enhancement
description: Do you have a suggestion for a new feature or a way to improve Refined Storage? Let us know.
description: Do you have a suggestion for a new feature or improvement? Let us know.
labels: [ enhancement ]
body:
- type: markdown
Expand All @@ -8,7 +8,7 @@ body:
Provide a summary of the enhancement in the title above.
Please follow following guidelines before proposing an enchancement:
1) Ensure that you are running on the latest Refined Storage 2 version (to ensure that the enhancement does not exist yet).
1) Ensure that you are running on the latest version (to ensure that the enhancement does not exist yet).
2) Ensure that your enhancement hasn't already been posted. Please look in the closed issues as well (for enhancements that have been denied).
We might close your issue, without explanation, if you do not follow these guidelines.
Expand Down
2 changes: 1 addition & 1 deletion .github/SUPPORT.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ Questions can be asked on [Discord](https://discordapp.com/invite/VYzsydb).

## I have found a bug

If you have found a bug, please report it on a [GitHub issues](https://github.com/refinedmods/refinedstorage2/issues).
If you have found a bug, please report it on [GitHub issues](https://github.com/refinedmods/refinedstorage2/issues).
17 changes: 0 additions & 17 deletions .github/actions/setup-java/action.yml

This file was deleted.

58 changes: 2 additions & 56 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,61 +6,7 @@ on:
- main
pull_request:
types: [ opened, synchronize, reopened ]
workflow_call:
inputs:
version:
required: false
type: string
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Set version number
if: "${{ inputs.version != '' }}"
run: |
echo "RELEASE_VERSION=${{ inputs.version }}" >> $GITHUB_ENV
- name: Checkout repository
uses: actions/checkout@v3
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Setup Java
uses: ./.github/actions/setup-java
# https://docs.sonarqube.org/latest/analysis/github-integration/
- name: Cache SonarQube packages
uses: actions/cache@v3
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Build and test
if: ${{ github.event.pull_request.head.repo.fork }}
run: ./gradlew build codeCoverageReport
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
# TODO: We have to disable Sonar for now on forked PR builds as the analyze fails due to permission issues.
- name: Build, test and analyze
if: ${{ !github.event.pull_request.head.repo.fork }}
run: ./gradlew build codeCoverageReport sonarqube
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
- name: Publish test report
uses: mikepenz/action-junit-report@v3
if: always() # always run even if the previous step fails
with:
report_paths: '**/build/test-results/test/TEST-*.xml'
- name: Publish Checkstyle report
uses: Juuxel/publish-checkstyle-report@v1
if: ${{ failure() }}
with:
reports: |
**/build/reports/checkstyle/*.xml
- name: Mutation testing
run: ./gradlew pitest
- name: Upload build artifacts
if: ${{ runner.os == 'Linux' }}
uses: actions/upload-artifact@v3
with:
name: Artifacts
path: '**/build/libs/'
uses: refinedmods/refinedarchitect/.github/workflows/[email protected]
secrets: inherit
62 changes: 8 additions & 54 deletions .github/workflows/draft-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,60 +11,14 @@ on:
- major
- minor
- patch
version-number:
description: 'Version number'
version-number-override:
description: 'Version number override'
required: false
type: string
jobs:
draft:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
with:
token: ${{ secrets.GITFLOW_PUSH_TOKEN }}
- name: Get latest version from changelog
if: "${{ github.event.inputs.version-number == '' }}"
id: changelog
uses: mindsers/changelog-reader-action@v2
with:
path: ./CHANGELOG.md
- name: Get version number to release (Semver)
if: "${{ github.event.inputs.version-number == '' }}"
uses: actions-ecosystem/action-bump-semver@v1
id: bump-semver
with:
current_version: ${{ steps.changelog.outputs.version }}
level: ${{ github.event.inputs.release-type }}
- name: Assign version number to release (Semver)
if: "${{ github.event.inputs.version-number == '' }}"
run: |
echo "VERSION=${{ steps.bump-semver.outputs.new_version }}" >> $GITHUB_ENV
- name: Assign version number to release (manual)
if: "${{ github.event.inputs.version-number != '' }}"
run: |
echo "VERSION=${{ github.event.inputs.version-number }}" >> $GITHUB_ENV
- name: Update changelog
uses: thomaseizinger/[email protected]
with:
version: ${{ env.VERSION }}
tag: v${{ env.VERSION }}
- name: Commit and push changes
uses: EndBug/add-and-commit@v9
with:
add: 'CHANGELOG.md'
default_author: github_actor
message: 'chore: prepare release v${{ env.VERSION }}'
new_branch: 'release/${{ env.VERSION }}'
push: true
- name: Create pull request for release
uses: thomaseizinger/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITFLOW_PUSH_TOKEN }}
with:
head: release/${{ env.VERSION }}
base: main
title: Release v${{ env.VERSION }}
body: |
Hi @${{ github.actor }}!
This PR was created in response to a manual trigger of the release workflow here: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}.
Merging this PR will publish the release.
uses: refinedmods/refinedarchitect/.github/workflows/[email protected]
with:
release-type: ${{ inputs.release-type }}
version-number-override: ${{ inputs.version-number-override }}
secrets: inherit
11 changes: 1 addition & 10 deletions .github/workflows/issue-for-unsupported-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,4 @@ on:
types: [ labeled, unlabeled, reopened ]
jobs:
unsupported-labeler:
runs-on: ubuntu-latest
steps:
- uses: dessant/support-requests@v3
with:
github-token: ${{ github.token }}
support-label: 'unsupported'
issue-comment: >
:wave: @{issue-author}, we no longer support this version of Refined Storage.
close-issue: true
lock-issue: false
uses: refinedmods/refinedarchitect/.github/workflows/[email protected]
Loading

0 comments on commit 59fdad9

Please sign in to comment.