Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feat/deploy-oci
Browse files Browse the repository at this point in the history
  • Loading branch information
vdice committed Aug 10, 2023
2 parents c1fbbc6 + 643ceac commit 9ba9494
Show file tree
Hide file tree
Showing 22 changed files with 3,239 additions and 1,088 deletions.
11 changes: 10 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,20 @@ on:
branches: ["main", "v*"]
# Also run on tag pushes, as the release.yml doesn't currently run tests
tags: ["v*"]
paths-ignore:
- ".plugin-manifests/**"
- "*.md"
- "LICENSE"
- ".github/workflow/audits.yml"
- "supply-chain/**"
pull_request:
branches: ["main", "v*"]
paths-ignore:
- ".plugin-manifests/**"
- "README.md"
- "*.md"
- "LICENSE"
- ".github/workflow/audits.yml"
- "supply-chain/**"

env:
CARGO_TERM_COLOR: always
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ on:
- main
tags:
- "v*"
paths-ignore:
- ".plugin-manifests/**"
- "*.md"
- "LICENSE"
- ".github/workflow/audits.yml"
- "supply-chain/**"
workflow_dispatch:

env:
Expand All @@ -16,9 +22,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Fetch tags
run: git fetch origin --tags

- name: 'Check if canary tag exists'
id: canaryExists
Expand Down Expand Up @@ -165,6 +168,7 @@ jobs:
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: _dist/cloud-${{ env.RELEASE_VERSION }}-${{ env.RUNNER_OS }}-${{ matrix.config.arch }}.tar.gz
overwrite: true
tag: "canary"

checksums_and_manifests:
Expand Down Expand Up @@ -205,6 +209,7 @@ jobs:
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: checksums-${{ env.RELEASE_VERSION }}.txt
overwrite: true
tag: "canary"

- name: create plugin manifest
Expand All @@ -216,4 +221,5 @@ jobs:
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: cloud.json
overwrite: true
tag: ${{ env.RELEASE_VERSION }}
2 changes: 1 addition & 1 deletion .plugin-manifests/generate-manifest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ WINDOWS_AMD=$(cat $2 | grep "windows-amd64" | awk '{print $1}')
cat <<EOF
{
"name": "cloud",
"description": "The Fermyon Cloud Plugin",
"description": "Commands for publishing applications to the Fermyon Cloud.",
"homepage": "https://github.com/fermyon/cloud-plugin",
"version": "${VERSION//v}",
"spinCompatibility": "${SPIN_COMPAT_STRING}",
Expand Down
2 changes: 1 addition & 1 deletion .plugin-manifests/plugin-spin-compat.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
>=0.9
>=1.3
3 changes: 3 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Code of Conduct

This project subscribes to the Fermyon [Code of Conduct](https://www.fermyon.com/code-of-conduct).
3 changes: 3 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# CONTRIBUTING

<https://developer.fermyon.com/spin/contributing>
Loading

0 comments on commit 9ba9494

Please sign in to comment.