Skip to content

Commit ec4fc9f

Browse files
update upload-artifact to v4
1 parent 0dcb7e5 commit ec4fc9f

File tree

2 files changed

+25
-21
lines changed

2 files changed

+25
-21
lines changed

.github/workflows/release.yml

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ jobs:
4242
- name: Save deployment id
4343
uses: actions/upload-artifact@master
4444
with:
45+
name: artifacts1
4546
path: |
4647
deployment_id
4748
env
@@ -85,6 +86,7 @@ jobs:
8586
- name: Save generated info
8687
uses: actions/upload-artifact@master
8788
with:
89+
name: artifacts2
8890
path: |
8991
new_version
9092
title
@@ -115,8 +117,8 @@ jobs:
115117
- name: Parse info generated in preparation job
116118
id: info
117119
run: |
118-
echo "new_version=$(cat artifacts/artifact/new_version)" >> $GITHUB_OUTPUT
119-
echo "title=$(cat artifacts/artifact/title)" >> $GITHUB_OUTPUT
120+
echo "new_version=$(cat artifacts/artifacts2/new_version)" >> $GITHUB_OUTPUT
121+
echo "title=$(cat artifacts/artifacts2/title)" >> $GITHUB_OUTPUT
120122
- uses: xt0rted/pull-request-comment-branch@v1 # check out branch of PR
121123
id: comment-branch
122124
- uses: actions/checkout@v3
@@ -192,11 +194,11 @@ jobs:
192194
- name: Parse info generated in preparation job
193195
id: info
194196
run: |
195-
echo "new_version=$(cat artifacts/artifact/new_version)" >> $GITHUB_OUTPUT
196-
echo "title=$(cat artifacts/artifact/title)" >> $GITHUB_OUTPUT
197-
mv artifacts/artifact/new_version new_version
198-
mv artifacts/artifact/title title
199-
mv artifacts/artifact/latest_changes latest_changes
197+
echo "new_version=$(cat artifacts/artifacts2/new_version)" >> $GITHUB_OUTPUT
198+
echo "title=$(cat artifacts/artifacts2/title)" >> $GITHUB_OUTPUT
199+
mv artifacts/artifacts2/new_version new_version
200+
mv artifacts/artifacts2/title title
201+
mv artifacts/artifacts2/latest_changes latest_changes
200202
mkdir Release
201203
mv artifacts/app/${{ env.projname }}.zip Release/
202204
- name: Prepare Sparkle update creation # Import Sparkle private key, remove unnecessary files in Release folder
@@ -206,7 +208,9 @@ jobs:
206208
echo -n "$PRIVATE_SPARKLE_KEY" > ./Configuration/sparkle_private_key
207209
- name: Generate Sparkle notes # generate Sparkle release notes (convert Markdown to HTML)
208210
run: |
209-
pip3 install -r Configuration/requirements.txt
211+
python3 -m venv penv
212+
source penv/bin/activate
213+
python3 -m pip install -r Configuration/requirements.txt
210214
python3 ./Configuration/generate_html_for_sparkle_release.py
211215
mv Release/latest_changes.html Release/${{ env.projname }}.html
212216
- name: Update appcast # generate / update appcast.xml with edDSA key
@@ -272,11 +276,11 @@ jobs:
272276
- name: Parse info generated in preparation job
273277
id: info
274278
run: |
275-
echo "new_version=$(cat artifacts/artifact/new_version)" >> $GITHUB_OUTPUT
276-
echo "title=$(cat artifacts/artifact/title)" >> $GITHUB_OUTPUT
277-
mv artifacts/artifact/new_version new_version
278-
mv artifacts/artifact/title title
279-
mv artifacts/artifact/latest_changes latest_changes
279+
echo "new_version=$(cat artifacts/artifacts2/new_version)" >> $GITHUB_OUTPUT
280+
echo "title=$(cat artifacts/artifacts2/title)" >> $GITHUB_OUTPUT
281+
mv artifacts/artifacts2/new_version new_version
282+
mv artifacts/artifacts2/title title
283+
mv artifacts/artifacts2/latest_changes latest_changes
280284
mkdir Release
281285
mv artifacts/app/${{ env.projname }}.zip Release/
282286
- name: Override versions in project # set new version in project
@@ -336,7 +340,7 @@ jobs:
336340
- name: Parse info generated in preparation job
337341
id: info
338342
run: |
339-
echo "new_version=$(cat artifacts/artifact/new_version)" >> $GITHUB_OUTPUT
343+
echo "new_version=$(cat artifacts/artifacts2/new_version)" >> $GITHUB_OUTPUT
340344
- name: Update brew formula # update brew formula
341345
env:
342346
HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.BREW_TOKEN }}
@@ -355,9 +359,9 @@ jobs:
355359
- name: Parse info generated in preparation job
356360
id: info
357361
run: |
358-
echo "new_version=$(cat artifacts/artifact/new_version)" >> $GITHUB_OUTPUT
359-
echo "deployment_id=$(cat artifacts/artifact/deployment_id)" >> $GITHUB_OUTPUT
360-
echo "env=$(cat artifacts/artifact/env)" >> $GITHUB_OUTPUT
362+
echo "new_version=$(cat artifacts/artifacts2/new_version)" >> $GITHUB_OUTPUT
363+
echo "deployment_id=$(cat artifacts/artifacts1/deployment_id)" >> $GITHUB_OUTPUT
364+
echo "env=$(cat artifacts/artifacts1/env)" >> $GITHUB_OUTPUT
361365
- uses: xt0rted/pull-request-comment-branch@v1 # check out branch of PR
362366
id: comment-branch
363367
- uses: actions/checkout@v3 # checkout again, because the previous checkout is detached

SlimHUD.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,7 @@
841841
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
842842
CODE_SIGN_STYLE = Automatic;
843843
COMBINE_HIDPI_IMAGES = YES;
844-
CURRENT_PROJECT_VERSION = 1.5.2;
844+
CURRENT_PROJECT_VERSION = 1.5.0;
845845
DEVELOPMENT_TEAM = XX9N244QQT;
846846
ENABLE_HARDENED_RUNTIME = NO;
847847
GENERATE_INFOPLIST_FILE = YES;
@@ -856,7 +856,7 @@
856856
"@executable_path/../Frameworks",
857857
);
858858
MACOSX_DEPLOYMENT_TARGET = 10.13;
859-
MARKETING_VERSION = 1.5.2;
859+
MARKETING_VERSION = 1.5.0;
860860
PRODUCT_BUNDLE_IDENTIFIER = com.alexpera.SlimHUD;
861861
PRODUCT_NAME = "$(TARGET_NAME)";
862862
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -873,7 +873,7 @@
873873
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
874874
CODE_SIGN_STYLE = Automatic;
875875
COMBINE_HIDPI_IMAGES = YES;
876-
CURRENT_PROJECT_VERSION = 1.5.2;
876+
CURRENT_PROJECT_VERSION = 1.5.0;
877877
DEVELOPMENT_TEAM = XX9N244QQT;
878878
ENABLE_HARDENED_RUNTIME = NO;
879879
GENERATE_INFOPLIST_FILE = YES;
@@ -888,7 +888,7 @@
888888
"@executable_path/../Frameworks",
889889
);
890890
MACOSX_DEPLOYMENT_TARGET = 10.13;
891-
MARKETING_VERSION = 1.5.2;
891+
MARKETING_VERSION = 1.5.0;
892892
PRODUCT_BUNDLE_IDENTIFIER = com.alexpera.SlimHUD;
893893
PRODUCT_NAME = "$(TARGET_NAME)";
894894
SWIFT_EMIT_LOC_STRINGS = YES;

0 commit comments

Comments
 (0)