Skip to content

Commit c226027

Browse files
committed
updated process regarding AppVeyor
See OpenSC/OpenSC#3667
1 parent 63f9a81 commit c226027

1 file changed

Lines changed: 10 additions & 46 deletions

File tree

OpenSC-Release-Howto.md

Lines changed: 10 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ Release (or RC) version must be changed in the following files:
3434
* `NEWS`: Make sure to fix the release date for final release!
3535
* `VERSION.mk` : change package version major/minor/fix as needed, RCs get the package suffix `-rc`, which is removed for the final release
3636
* `configure.ac` : Update the [LT version number](https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html), which is required with changes to, for example, `opensc.h` and `libopensc.exports`.
37-
* `.appveyor.yml`: Update the version on first line
3837
* `README.md`: Update the links to the new release and binaries
3938
* `SECURITY.md`: Update supported version
4039

@@ -133,56 +132,23 @@ Optionally, discuss changes to `NEWS` by opening a [new issue](https://github.co
133132

134133
2. Add commits with fixes
135134
* Use git `cherry-pick -x` to pick commits from `master` to reference commit hashes
136-
3. Remove suffixes from build names in `appveyor.yml` and `.github/build.sh` script
137-
138-
```diff
139-
diff --git a/.appveyor.yml b/.appveyor.yml
140-
index 4599100ad2..bca1775ae3 100644
141-
--- a/.appveyor.yml
142-
+++ b/.appveyor.yml
143-
@@ -96,8 +96,7 @@ build_script:
144-
}
145-
- bash -c "exec 0</dev/null && if [ \"$APPVEYOR_REPO_BRANCH\" == \"master\" -a -z \"$APPVEYOR_PULL_REQUEST_NUMBER\" ]; then ./bootstrap; fi"
146-
- bash -c "exec 0</dev/null && if [ \"$APPVEYOR_REPO_BRANCH\" == \"master\" -a -n \"$APPVEYOR_PULL_REQUEST_NUMBER\" ]; then ./bootstrap.ci -s \"-pr$APPVEYOR_PULL_REQUEST_NUMBER\"; fi"
147-
- - bash -c "exec 0</dev/null && if [ \"$APPVEYOR_REPO_BRANCH\" != \"master\" -a -z \"$APPVEYOR_PULL_REQUEST_NUMBER\" ]; then ./bootstrap.ci -s \"-$APPVEYOR_REPO_BRANCH\"; fi"
148-
- - bash -c "exec 0</dev/null && if [ \"$APPVEYOR_REPO_BRANCH\" != \"master\" -a -n \"$APPVEYOR_PULL_REQUEST_NUMBER\" ]; then ./bootstrap.ci -s \"-$APPVEYOR_REPO_BRANCH-prAPPVEYOR_PULL_REQUEST_NUMBER\"; fi"
149-
+ - bash -c "exec 0</dev/null && if [ \"$APPVEYOR_REPO_BRANCH\" != \"master\" ]; then ./bootstrap; fi"
150-
# disable features to speed up the script
151-
- bash -c "exec 0</dev/null && ./configure --with-cygwin-native --disable-openssl --disable-readline --disable-zlib || cat config.log"
152-
- bash -c "exec 0</dev/null && rm src/getopt.h"
153-
diff --git a/.github/build.sh b/.github/build.sh
154-
index 7770590af1..afb58af450 100755
155-
--- a/.github/build.sh
156-
+++ b/.github/build.sh
157-
@@ -15,11 +15,6 @@ if [ "$GITHUB_EVENT_NAME" == "pull_request" ]; then
158-
else
159-
SUFFIX="$GITHUB_BASE_REF-pr$PR_NUMBER"
160-
fi
161-
-else
162-
- BRANCH=$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }')
163-
- if [ "$BRANCH" != "master" ]; then
164-
- SUFFIX="$BRANCH"
165-
- fi
166-
fi
167-
if [ -n "$SUFFIX" ]; then
168-
./bootstrap.ci -s "$SUFFIX" </code></pre>
169-
```
170135

171-
4. Both in `stable-0.X.[Y+1]` and `master` branch:
172-
* update version in `.appveyor.yml`,
136+
3. Both in `stable-0.X.[Y+1]` and `master` branch:
173137
* update `NEWS` with changes,
174138
* update version in `SECURITY.md`,
175139
* update version and LT revision in `configure.ac`.
176-
5. Push release tag `0.X.[Y+1]` into `stable-0.X.[Y+1]` branch
140+
4. Push release tag `0.X.[Y+1]` into `stable-0.X.[Y+1]` branch
177141

178142
```bash
179143
git tag -a 0.25.1
180144
git push origin 0.25.1
181145
```
182146

183-
6. Wait for [artifacts to build](#build-and-test-binaries)
184-
7. [Create a new release](#build-and-test-binaries)
185-
8. Write [announcement](#announcement)
147+
5. Wait for [artifacts to build](#build-and-test-binaries)
148+
149+
6. [Create a new release](#build-and-test-binaries)
150+
151+
7. Write [announcement](#announcement)
186152

187153
## Maintenance tasks
188154

@@ -195,11 +161,9 @@ Optionally, discuss changes to `NEWS` by opening a [new issue](https://github.co
195161

196162
### Refreshing access tokens
197163

198-
There are two access tokens that are used by CI to push artifacts to the Nightly repository. One from Github
199-
Actions and one from AppVeyor. Their expiration can be checked on the
164+
From Github Actions, there is one access token that is used by CI to push artifacts to the Nightly repository.Its expiration can be checked on the
200165
[organization settings](https://github.com/organizations/OpenSC/settings/personal-access-tokens/active) page.
201166

202-
* When they expire, the new need tokens need to be generated in [user settings](https://github.com/settings/tokens?type=beta).
203-
* Both tokens need _Read_ and _Write_ access to code and _Read_ access to metadata in OpenSC/Nightly repository.
167+
* When it expires, the new token needs to be generated in [user settings](https://github.com/settings/tokens?type=beta).
168+
* The token need _Read_ and _Write_ access to code and _Read_ access to metadata in OpenSC/Nightly repository.
204169
* The Github Actions token needs to be inserted into the [OpenSC repository secrets](https://github.com/OpenSC/OpenSC/settings/secrets/actions).
205-
* The AppVeyor token needs to be encrypted using [AppVeyor website](https://ci.appveyor.com/account/frankmorgner/tools/encrypt) and updated in the `.appveyor.yml` for example like done in [#3230](https://github.com/OpenSC/OpenSC/pull/3230).

0 commit comments

Comments
 (0)