Skip to content

Commit a585c6b

Browse files
authored
Merge pull request #16 from derskythe/feat/ci
Feat/ci
2 parents 869eb28 + b384bdb commit a585c6b

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

.github/actions/make-release/action.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ inputs:
2929
description: 'remote_tag_info'
3030
required: true
3131

32-
outputs:
33-
make-minor-release:
34-
description: "make-minor-release"
35-
value: ${{ steps.make-minor-release.outputs }}
36-
make-major-release:
37-
description: "make-minor-release"
38-
value: ${{ steps.make-major-release.outputs }}
32+
# outputs:
33+
# make-minor-release:
34+
# description: "make-minor-release"
35+
# value: ${{ steps.make-minor-release.outputs }}
36+
# make-major-release:
37+
# description: "make-minor-release"
38+
# value: ${{ steps.make-major-release.outputs }}
3939

4040
runs:
4141
using: "composite"

.github/check-version.ps1

+7-6
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ function CleanInput
2222
################################################################################################################################
2323

2424
$Output = @{
25-
RELEASE_VERSION = ''
26-
CURRENT_TAG = ''
27-
REMOTE_TAG_INFO = ''
28-
RELEASE_TYPE = ''
25+
RELEASE_VERSION = $ReleaseVersion
26+
CURRENT_TAG = $FirmwareVersion
27+
REMOTE_TAG_INFO = $FirmwareVersion
28+
RELEASE_TYPE = 0
2929
}
3030

3131
$Release = @(`
@@ -75,9 +75,10 @@ elseif ($FirmwareVersionNumber -lt $StoredFirmwareVersionNumber)
7575
exit 1
7676
}
7777

78-
$LastPublished = (gh api -H "Accept: application/vnd.github+json" `
78+
$PublishDates = (gh api -H "Accept: application/vnd.github+json" `
7979
-H "X-GitHub-Api-Version: 2022-11-28" "/repos/$( $RepoSelf )/releases?per_page=1" `
80-
| ConvertFrom-Json).published_at
80+
| ConvertFrom-Json | Select-Object published_at, created_at)
81+
$LastPublished = ($null -eq $PublishDates.published_at ? $PublishDates.created_at : $PublishDates.published_at)
8182
$Delta = ([DateTime]::Now - $LastPublished)
8283

8384
$Release = (gh api -H "Accept: application/vnd.github+json" `

.github/workflows/build-with-firmwware.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
required: false
1010
type: string
1111
release:
12-
types: [unpublished]
12+
types: [created]
1313
push:
1414
paths:
1515
- .github/workflows/build-with-firmware.yml
@@ -30,6 +30,7 @@ jobs:
3030
IGNORED_PATH: "applications_user/subbrute"
3131
RELATIVE_PATH: "applications/external/subbrute"
3232
CURRENT_VERSION: ${{ vars.RELEASE_VERSION }}
33+
RELEASE_VERSION: ${{ vars.RELEASE_VERSION }}
3334
strategy:
3435
fail-fast: false
3536
matrix:

0 commit comments

Comments
 (0)