Skip to content

Commit

Permalink
Update to latest and gratest
Browse files Browse the repository at this point in the history
- version bump
- upstream image update
- build and release workflow update
  • Loading branch information
k0gen committed Mar 19, 2024
1 parent cd16e61 commit 17afa75
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 21 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/buildService.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: Build Service
on:
workflow_dispatch:
pull_request:
paths-ignore: ['*.md']
branches: ['main', 'master']
paths-ignore: ["*.md"]
branches: ["main", "master"]
push:
paths-ignore: ['*.md']
branches: ['main', 'master']
paths-ignore: ["*.md"]
branches: ["main", "master"]

jobs:
BuildPackage:
Expand All @@ -26,11 +26,11 @@ jobs:
start-sdk init
make
PACKAGE_ID=$(yq -oy ".id" manifest.*)
echo "::set-output name=package_id::$PACKAGE_ID"
echo "package_id=$PACKAGE_ID" >> $GITHUB_ENV
shell: bash

- name: Upload .s9pk
uses: actions/upload-artifact@v3
with:
name: ${{ steps.build.outputs.package_id }}.s9pk
path: ./${{ steps.build.outputs.package_id }}.s9pk
name: ${{ env.package_id }}.s9pk
path: ./${{ env.package_id }}.s9pk
18 changes: 9 additions & 9 deletions .github/workflows/releaseService.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Release Service
on:
push:
tags:
- 'v*.*'
- "v*.*"

jobs:
ReleasePackage:
Expand All @@ -26,19 +26,19 @@ jobs:
- name: Setting package ID and title from the manifest
id: package
run: |
echo "::set-output name=package_id::$(yq -oy ".id" manifest.*)"
echo "::set-output name=package_title::$(yq -oy ".title" manifest.*)"
echo "package_id=$(yq -oy ".id" manifest.*)" >> $GITHUB_ENV
echo "package_title=$(yq -oy ".title" manifest.*)" >> $GITHUB_ENV
shell: bash

- name: Generate sha256 checksum
run: |
PACKAGE_ID=${{ steps.package.outputs.package_id }}
PACKAGE_ID=${{ env.package_id }}
sha256sum ${PACKAGE_ID}.s9pk > ${PACKAGE_ID}.s9pk.sha256
shell: bash

- name: Generate changelog
run: |
PACKAGE_ID=${{ steps.package.outputs.package_id }}
PACKAGE_ID=${{ env.package_id }}
echo "## What's Changed" > change-log.txt
yq -oy '.release-notes' manifest.* >> change-log.txt
echo "## SHA256 Hash" >> change-log.txt
Expand All @@ -51,12 +51,12 @@ jobs:
uses: softprops/action-gh-release@v1
with:
tag_name: ${{ github.ref_name }}
name: ${{ steps.package.outputs.package_title }} ${{ github.ref_name }}
name: ${{ env.package_title }} ${{ github.ref_name }}
prerelease: true
body_path: change-log.txt
files: |
./${{ steps.package.outputs.package_id }}.s9pk
./${{ steps.package.outputs.package_id }}.s9pk.sha256
./${{ env.package_id }}.s9pk
./${{ env.package_id }}.s9pk.sha256
- name: Publish to Registry
env:
Expand All @@ -67,5 +67,5 @@ jobs:
if [[ -z "$S9USER" || -z "$S9PASS" || -z "$S9REGISTRY" ]]; then
echo "Publish skipped: missing registry credentials."
else
start-sdk publish https://$S9USER:$S9PASS@$S9REGISTRY ${{ steps.package.outputs.package_id }}.s9pk
start-sdk publish https://$S9USER:$S9PASS@$S9REGISTRY ${{ env.package_id }}.s9pk
fi
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gitea/gitea:1.21.2
FROM gitea/gitea:1.21.8

RUN apk add --no-cache tini curl yq; \
rm -f /var/cache/apk/*
Expand Down
5 changes: 2 additions & 3 deletions manifest.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
id: gitea
title: "Gitea"
version: 1.21.2
version: 1.21.8
release-notes: |
* Upstream code update
* Updated error handling in health checks
* Full list of upstream changes available [here](https://github.com/go-gitea/gitea/compare/v1.20.5...v1.21.2)
* Full list of upstream changes available [here](https://github.com/go-gitea/gitea/compare/v1.21.2...v1.21.8)
license: MIT
wrapper-repo: "https://github.com/Start9Labs/gitea-startos"
upstream-repo: "https://github.com/go-gitea/gitea"
Expand Down
2 changes: 1 addition & 1 deletion scripts/procedures/migrations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ export const migration: T.ExpectedExports.migration = compat.migrations
throw new Error("Downgrade not supported");
},
},
}, "1.21.2");
}, "1.21.8");

0 comments on commit 17afa75

Please sign in to comment.