Skip to content

Commit c4e4fa0

Browse files
committed
ci fixes the 3rd
1 parent 9803583 commit c4e4fa0

1 file changed

Lines changed: 36 additions & 35 deletions

File tree

.github/workflows/staging.yml

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ jobs:
6262
DATE=$(date +%Y-%m-%d)
6363
BASE_VERSION=$(grep -oPm1 '(?<=<BaseVersion>)[^<]+' Directory.Build.props)
6464
VERSION="${BASE_VERSION}+${HASH}"
65-
echo "GIT_HASH=$HASH" >> "$GITHUB_ENV"
66-
echo "BUILD_DATE=$DATE" >> "$GITHUB_ENV"
67-
echo "VERSION=$VERSION" >> "$GITHUB_ENV"
68-
echo "BASE_VERSION=$BASE_VERSION" >> "$GITHUB_ENV"
65+
echo "GIT_HASH=$HASH" >> "$GITHUB_ENV"
66+
echo "BUILD_DATE=$DATE" >> "$GITHUB_ENV"
67+
echo "VERSION=$VERSION" >> "$GITHUB_ENV"
68+
echo "BASE_VERSION=$BASE_VERSION" >> "$GITHUB_ENV"
6969
7070
- name: Publish application
7171
run: |
@@ -130,14 +130,13 @@ jobs:
130130
fetch-depth: 0
131131

132132
- name: Resolve git metadata
133-
id: meta
134133
run: |
135134
HASH=$(git rev-parse --short HEAD)
136135
DATE=$(date +%Y-%m-%d)
137-
VERSION="${{ env.BASE_VERSION }}+${HASH}"
138-
echo "GIT_HASH=$HASH" >> "$GITHUB_ENV"
139-
echo "BUILD_DATE=$DATE" >> "$GITHUB_ENV"
140-
echo "VERSION=$VERSION" >> "$GITHUB_ENV"
136+
BASE_VERSION=$(grep -oPm1 '(?<=<BaseVersion>)[^<]+' Directory.Build.props)
137+
echo "GIT_HASH=$HASH" >> "$GITHUB_ENV"
138+
echo "BUILD_DATE=$DATE" >> "$GITHUB_ENV"
139+
echo "VERSION=${BASE_VERSION}+${HASH}" >> "$GITHUB_ENV"
141140
142141
- name: Download all build artifacts
143142
uses: actions/download-artifact@v4
@@ -146,33 +145,33 @@ jobs:
146145

147146
- name: Display structure of downloaded files
148147
run: ls -R artifacts
149-
150-
# Delete existing nightly release to allow tag re-use
151-
- name: Delete existing nightly release
148+
149+
- name: Update nightly release
152150
env:
153151
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
154-
run: gh release delete nightly --yes --cleanup-tag 2>/dev/null || true
155-
156-
- name: Create nightly release
157-
id: create_release
158-
uses: softprops/action-gh-release@v2
159-
with:
160-
tag_name: nightly
161-
name: "Nightly (${{ env.BUILD_DATE }}) — ${{ env.VERSION }}"
162-
body: |
163-
**Branch:** `develop`
164-
**Commit:** `${{ env.GIT_HASH }}`
165-
**Built:** ${{ env.BUILD_DATE }}
166-
167-
> Automated nightly build — not intended for production use.
168-
prerelease: true
169-
draft: true
170-
files: "artifacts/**/*"
152+
run: |
153+
NOTES="**Branch:** \`development\`
154+
**Commit:** \`${{ env.GIT_HASH }}\`
155+
**Built:** ${{ env.BUILD_DATE }}
156+
157+
> Automated nightly build — not intended for production use."
171158

172-
- name: Publish nightly release
173-
env:
174-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
175-
run: gh release edit nightly --draft=false --prerelease
159+
if gh release view nightly &>/dev/null; then
160+
gh release edit nightly \
161+
--title "Nightly (${{ env.BUILD_DATE }}) — ${{ env.VERSION }}" \
162+
--notes "$NOTES" \
163+
--prerelease
164+
165+
gh release view nightly --json assets --jq '.assets[].name' \
166+
| xargs -r -I{} gh release delete-asset nightly {} --yes
167+
168+
find artifacts -type f | xargs gh release upload nightly
169+
else
170+
find artifacts -type f | xargs gh release create nightly \
171+
--title "Nightly (${{ env.BUILD_DATE }}) — ${{ env.VERSION }}" \
172+
--notes "$NOTES" \
173+
--prerelease
174+
fi
176175

177176
# --- JOB 3: AUR NIGHTLY ---
178177
deploy-aur-nightly:
@@ -196,8 +195,10 @@ jobs:
196195
run: |
197196
HASH=$(git rev-parse --short HEAD)
198197
DATE=$(date +%Y%m%d)
199-
VERSION="${{ env.BASE_VERSION }}.${DATE}.${HASH}"
200-
198+
BASE_VERSION=$(grep -oPm1 '(?<=<BaseVersion>)[^<]+' Directory.Build.props)
199+
VERSION="${BASE_VERSION}.${DATE}.${HASH}"
200+
echo "VERSION=$VERSION" >> "$GITHUB_ENV"
201+
201202
SHA_BIN=$(sha256sum OpenSSH-GUI-nightly-linux-x64 | cut -d' ' -f1)
202203
SHA_ICON=$(sha256sum OpenSSH_GUI/Assets/appicon.png | cut -d' ' -f1)
203204
SHA_DESKTOP=$(sha256sum openssh-gui.desktop | cut -d' ' -f1)

0 commit comments

Comments
 (0)