Skip to content
This repository has been archived by the owner on Mar 23, 2021. It is now read-only.

Commit

Permalink
Merge pull request #2234 from comit-network/release/0.7.1
Browse files Browse the repository at this point in the history
Release version 0.7.1
  • Loading branch information
thomaseizinger authored Mar 12, 2020
2 parents 27f8862 + 5782045 commit d11346b
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 17 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/lint-workflow-files.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: "Lint GitHub workflow files"

on: push

jobs:
lint:
runs-on: ubuntu-latest
steps:
- name: Checkout source code
uses: actions/checkout@v2

- name: Setup NodeJS
uses: actions/setup-node@v1

- name: Run spectral
run: npx @stoplight/spectral lint .github/workflows/*.yml --ignore-unknown-format --verbose
32 changes: 16 additions & 16 deletions .github/workflows/publish-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
name: Build binary
strategy:
matrix:
os: [ubuntu, macos]
runs-on: ${{ matrix.os }}-latest
os: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout merge commit
uses: actions/checkout@v2
Expand Down Expand Up @@ -72,13 +72,13 @@ jobs:
- name: Download ubuntu release package
uses: actions/download-artifact@v1
with:
name: ubuntu-release-archive
name: ubuntu-latest-release-archive

- name: Move binary into correct place for Docker build
run: |
mkdir -p ./target/release
tar --extract -f ./ubuntu-release-archive/*.tar.gz -C ./target/release/
tar --extract -f ./ubuntu-latest-release-archive/*.tar.gz -C ./target/release/
- name: Login to docker
uses: azure/docker-login@v1
Expand Down Expand Up @@ -120,18 +120,18 @@ jobs:
- name: Download ubuntu release package
uses: actions/download-artifact@v1
with:
name: ubuntu-release-archive
name: ubuntu-latest-release-archive

- name: Download macos release package
uses: actions/download-artifact@v1
with:
name: macos-release-archive
name: macos-latest-release-archive

- name: Detect archives to upload
id: detect-archives
run: |
echo "::set-output name=ubuntu-archive::$(cd ./ubuntu-release-archive/; echo *.tar.gz)"
echo "::set-output name=macos-archive::$(cd ./macos-release-archive/; echo *.tar.gz)"
echo "::set-output name=ubuntu-archive::$(cd ./ubuntu-latest-release-archive/; echo *.tar.gz)"
echo "::set-output name=macos-archive::$(cd ./macos-latest-release-archive/; echo *.tar.gz)"
- name: Create Release
id: create-release
Expand All @@ -151,7 +151,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create-release.outputs.upload_url }}
asset_path: ./ubuntu-release-archive/${{ steps.detect-archives.outputs.ubuntu-archive }}
asset_path: ./ubuntu-latest-release-archive/${{ steps.detect-archives.outputs.ubuntu-archive }}
asset_name: ${{ steps.detect-archives.outputs.ubuntu-archive }}
asset_content_type: application/gzip

Expand All @@ -161,7 +161,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create-release.outputs.upload_url }}
asset_path: ./macos-release-archive/${{ steps.detect-archives.outputs.macos-archive }}
asset_path: ./macos-latest-release-archive/${{ steps.detect-archives.outputs.macos-archive }}
asset_name: ${{ steps.detect-archives.outputs.macos-archive }}
asset_content_type: application/gzip

Expand All @@ -182,10 +182,10 @@ jobs:
uses: thomaseizinger/[email protected]
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
head: release/${{ steps.extract-version.outputs.version }}
base: dev
title: Merge release ${{ steps.extract-version.outputs.version }} into dev branch
body: |
This PR merges the release branch for ${{ steps.extract-version.outputs.version }} back into dev.
This happens to ensure that the updates that happend on the release branch, i.e. CHANGELOG and manifest updates are also present on the dev branch.
head: release/${{ steps.extract-version.outputs.version }}
base: dev
title: Merge release ${{ steps.extract-version.outputs.version }} into dev branch
body: |
This PR merges the release branch for ${{ steps.extract-version.outputs.version }} back into dev.
This happens to ensure that the updates that happend on the release branch, i.e. CHANGELOG and manifest updates are also present on the dev branch.
12 changes: 12 additions & 0 deletions .spectral.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
rules:
github-worklows:
description: "GitHub workflow files must match provided schema"
message: "{{error}}"
recommended: true
severity: error
given: "$"
then:
function: schema
functionOptions:
schema:
$ref: http://json.schemastore.org/github-workflow
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.7.1] - 2020-03-12

### Fixed

- The release workflow for GitHub Actions was unfortunately broken.

### Added

- Linting of GitHub Actions workflows to prevent silly mistakes in the future.

## [0.7.0] - 2020-03-12

### Added
Expand Down Expand Up @@ -99,7 +109,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Move config files to standard location based on platform (OSX, Windows, Linux).
- Align implementation with RFC-002 to use the decision header instead of status codes.

[Unreleased]: https://github.com/comit-network/comit-rs/compare/0.7.0...HEAD
[Unreleased]: https://github.com/comit-network/comit-rs/compare/0.7.1...HEAD

[0.7.0]: https://github.com/comit-network/comit-rs/compare/0.7.0...0.7.1

[0.7.0]: https://github.com/comit-network/comit-rs/compare/0.6.0...0.7.0

Expand Down

0 comments on commit d11346b

Please sign in to comment.