Skip to content

Commit ab2097f

Browse files
committed
Merge branch 'xpack-develop' of https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack into xpack-develop
2 parents f253f93 + 00f4c09 commit ab2097f

File tree

5 files changed

+81
-40
lines changed

5 files changed

+81
-40
lines changed

CHANGELOG.md

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,50 @@
33

44
Entries in this file are in reverse chronological order.
55

6+
## 2023-09-18
7+
8+
* v12.3.0-2 prepared
9+
10+
## 2023-09-11
11+
12+
* e518287 package.json: bump deps
13+
14+
## 2023-09-08
15+
16+
* eb45645 package.json: bump deps
17+
* bb14277 package.json 13.2.0-1.1
18+
* 3d516cd VERSION 13.2.0-1
19+
* d4ff753 versioning.sh: define XBB_GCC_PATCH_FILE_NAME
20+
21+
## 2023-09-06
22+
23+
* 194ed42 application.sh: temporarily disable multi-lib
24+
* 9503db9 package.json: bump deps
25+
* a58cd71 READMEs update
26+
* abff9a5 body-jekyll update
27+
28+
## 2023-09-05
29+
30+
* ca60e8c re-generate workflows
31+
* cf4e0e2 READMEs update
32+
* b55878d package.json: bump deps
33+
34+
## 2023-09-03
35+
36+
* 4fe3ec7 package.json: bump deps
37+
38+
## 2023-08-29
39+
40+
* cb62e6b versioning.sh: explain new makeinfo needed
41+
42+
## 2023-08-28
43+
44+
* 1501334 READMEs update
45+
646
## 2023-08-25
747

8-
* v12.3.0-1.1 published on npmjs.com
48+
2023-08-25 * 522a594 12.3.0-1.1
49+
2023-08-25 * 53940f7 CHANGELOG: publish npm v12.3.0-1.1
950
* 7dba1ee package.json: update urls for 12.3.0-1 release
1051
* 075e53a CHANGELOG update
1152

README-MAINTAINER.md

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ update the dependencies in `package.json`.
102102
### Identify the main GCC version
103103

104104
Determine the GCC version (like `12.3.0`) and update the `scripts/VERSION`
105-
file; the format is `12.3.0-1`. The fourth digit is the number of the
105+
file; the format is `12.3.0-2`. The fourth digit is the number of the
106106
the xPack GNU RISC-V Embedded GCC release number of this version.
107107

108108
### Fix possible open issues
@@ -111,7 +111,7 @@ Check GitHub issues and pull requests:
111111

112112
- <https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/issues/>
113113

114-
and fix them; assign them to a milestone (like `12.3.0-1`).
114+
and fix them; assign them to a milestone (like `12.3.0-2`).
115115

116116
### Check `README.md`
117117

@@ -121,22 +121,22 @@ but in the version specific release page.
121121

122122
### Update versions in `README` files
123123

124-
Update both full 5 numbers (`12.3.0-1.1`) and short 3 numbers (`12.3.0`)
124+
Update both full 5 numbers (`12.3.0-2.1`) and short 3 numbers (`12.3.0`)
125125
versions in:
126126

127127
- update version in `README-MAINTAINER.md`
128128
- update version in `README.md`
129129

130130
### Update version in `package.json` to a pre-release
131131

132-
Use the new version, suffixed by `pre`, like `12.3.0-1.pre`.
132+
Use the new version, suffixed by `pre`, like `12.3.0-2.pre`.
133133

134134
### Update `CHANGELOG.md`
135135

136136
- open the `CHANGELOG.md` file
137137
- check if all previous fixed issues are in
138-
- add a new entry like _* v12.3.0-1 prepared_
139-
- commit with a message like _prepare v12.3.0-1_
138+
- add a new entry like _* v12.3.0-2 prepared_
139+
- commit with a message like _prepare v12.3.0-2_
140140

141141
### Update the version specific code
142142

@@ -227,8 +227,8 @@ archive and its SHA signature, created in the `deploy` folder:
227227
```console
228228
$ ls -l ~/Work/xpack-dev-tools/riscv-none-elf-gcc-xpack.git/build/darwin-x64/deploy
229229
total 262456
230-
-rw-r--r-- 1 ilg staff 131934771 Aug 23 01:57 xpack-riscv-none-elf-gcc-12.3.0-1-darwin-x64.tar.gz
231-
-rw-r--r-- 1 ilg staff 118 Aug 23 01:57 xpack-riscv-none-elf-gcc-12.3.0-1-darwin-x64.tar.gz.sha
230+
-rw-r--r-- 1 ilg staff 131934771 Aug 23 01:57 xpack-riscv-none-elf-gcc-12.3.0-2-darwin-x64.tar.gz
231+
-rw-r--r-- 1 ilg staff 118 Aug 23 01:57 xpack-riscv-none-elf-gcc-12.3.0-2-darwin-x64.tar.gz.sha
232232
```
233233

234234
#### Apple Silicon macOS
@@ -261,8 +261,8 @@ archive and its SHA signature, created in the `deploy` folder:
261261
```console
262262
$ ls -l ~/Work/xpack-dev-tools/riscv-none-elf-gcc-xpack.git/build/darwin-arm64/deploy
263263
total 263048
264-
-rw-r--r-- 1 ilg staff 128160032 Aug 23 01:22 xpack-riscv-none-elf-gcc-12.3.0-1-darwin-arm64.tar.gz
265-
-rw-r--r-- 1 ilg staff 120 Aug 23 01:22 xpack-riscv-none-elf-gcc-12.3.0-1-darwin-arm64.tar.gz.sha
264+
-rw-r--r-- 1 ilg staff 128160032 Aug 23 01:22 xpack-riscv-none-elf-gcc-12.3.0-2-darwin-arm64.tar.gz
265+
-rw-r--r-- 1 ilg staff 120 Aug 23 01:22 xpack-riscv-none-elf-gcc-12.3.0-2-darwin-arm64.tar.gz.sha
266266
```
267267

268268
#### Intel GNU/Linux
@@ -297,8 +297,8 @@ archive and its SHA signature, created in the `deploy` folder:
297297
```console
298298
$ ls -l ~/Work/xpack-dev-tools/riscv-none-elf-gcc-xpack.git/build/linux-x64/deploy
299299
total 138680
300-
-rw-r--r-- 1 ilg ilg 142003499 Aug 22 23:14 xpack-riscv-none-elf-gcc-12.3.0-1-linux-x64.tar.gz
301-
-rw-r--r-- 1 ilg ilg 117 Aug 22 23:14 xpack-riscv-none-elf-gcc-12.3.0-1-linux-x64.tar.gz.sha
300+
-rw-r--r-- 1 ilg ilg 142003499 Aug 22 23:14 xpack-riscv-none-elf-gcc-12.3.0-2-linux-x64.tar.gz
301+
-rw-r--r-- 1 ilg ilg 117 Aug 22 23:14 xpack-riscv-none-elf-gcc-12.3.0-2-linux-x64.tar.gz.sha
302302
```
303303

304304
##### Build the Intel Windows binaries
@@ -324,8 +324,8 @@ archive and its SHA signature, created in the `deploy` folder:
324324
```console
325325
$ ls -l ~/Work/xpack-dev-tools/riscv-none-elf-gcc-xpack.git/build/win32-x64/deploy
326326
total 150400
327-
-rw-r--r-- 1 ilg ilg 153999860 Aug 22 23:06 xpack-riscv-none-elf-gcc-12.3.0-1-win32-x64.zip
328-
-rw-r--r-- 1 ilg ilg 114 Aug 22 23:06 xpack-riscv-none-elf-gcc-12.3.0-1-win32-x64.zip.sha
327+
-rw-r--r-- 1 ilg ilg 153999860 Aug 22 23:06 xpack-riscv-none-elf-gcc-12.3.0-2-win32-x64.zip
328+
-rw-r--r-- 1 ilg ilg 114 Aug 22 23:06 xpack-riscv-none-elf-gcc-12.3.0-2-win32-x64.zip.sha
329329
```
330330

331331
#### Arm GNU/Linux 64-bit
@@ -358,8 +358,8 @@ archive and its SHA signature, created in the `deploy` folder:
358358
```console
359359
$ ls -l ~/Work/xpack-dev-tools/riscv-none-elf-gcc-xpack.git/build/linux-arm64/deploy
360360
total 135604
361-
-rw-r--r-- 1 ilg ilg 138853247 Aug 22 19:26 xpack-riscv-none-elf-gcc-12.3.0-1-linux-arm64.tar.gz
362-
-rw-r--r-- 1 ilg ilg 119 Aug 22 19:26 xpack-riscv-none-elf-gcc-12.3.0-1-linux-arm64.tar.gz.sha
361+
-rw-r--r-- 1 ilg ilg 138853247 Aug 22 19:26 xpack-riscv-none-elf-gcc-12.3.0-2-linux-arm64.tar.gz
362+
-rw-r--r-- 1 ilg ilg 119 Aug 22 19:26 xpack-riscv-none-elf-gcc-12.3.0-2-linux-arm64.tar.gz.sha
363363
```
364364

365365
#### Arm GNU/Linux 32-bit
@@ -390,8 +390,8 @@ archive and its SHA signature, created in the `deploy` folder:
390390
```console
391391
$ ls -l ~/Work/xpack-dev-tools/riscv-none-elf-gcc-xpack.git/build/linux-arm/deploy
392392
total 129736
393-
-rw-r--r-- 1 ilg ilg 132843190 Aug 22 19:15 xpack-riscv-none-elf-gcc-12.3.0-1-linux-arm.tar.gz
394-
-rw-r--r-- 1 ilg ilg 117 Aug 22 19:15 xpack-riscv-none-elf-gcc-12.3.0-1-linux-arm.tar.gz.sha
393+
-rw-r--r-- 1 ilg ilg 132843190 Aug 22 19:15 xpack-riscv-none-elf-gcc-12.3.0-2-linux-arm.tar.gz
394+
-rw-r--r-- 1 ilg ilg 117 Aug 22 19:15 xpack-riscv-none-elf-gcc-12.3.0-2-linux-arm.tar.gz.sha
395395
```
396396

397397
### Update README-MAINTAINER listing output
@@ -642,7 +642,7 @@ git clone \
642642
- check version:
643643

644644
```sh
645-
.../riscv-none-elf-gcc-12.3.0-1.1/bin/riscv-none-elf-gcc --version
645+
.../riscv-none-elf-gcc-12.3.0-2.1/bin/riscv-none-elf-gcc --version
646646
riscv-none-elf-gcc (xPack GNU RISC-V Embedded GCC x86_64) 12.3.0
647647
```
648648

@@ -670,7 +670,7 @@ riscv-none-elf-gcc (xPack GNU RISC-V Embedded GCC x86_64) 12.3.0
670670

671671
## Create a new GitHub pre-release draft
672672

673-
- in `CHANGELOG.md`, add the release date and a message like _* v12.3.0-1 released_
673+
- in `CHANGELOG.md`, add the release date and a message like _* v12.3.0-2 released_
674674
- commit with _CHANGELOG update_
675675
- check and possibly update the `templates/body-github-release-liquid.md`
676676
- push the `xpack-develop` branch
@@ -681,8 +681,8 @@ The workflows results and logs are available from the
681681

682682
The result is a
683683
[draft pre-release](https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/)
684-
tagged like **v12.3.0-1** (mind the dash in the middle!) and
685-
named like **xPack GNU RISC-V Embedded GCC v12.3.0-1** (mind the dash),
684+
tagged like **v12.3.0-2** (mind the dash in the middle!) and
685+
named like **xPack GNU RISC-V Embedded GCC v12.3.0-2** (mind the dash),
686686
with all binaries attached.
687687

688688
- edit the draft and attach it to the `xpack-develop` branch (important!)
@@ -705,7 +705,7 @@ If any, refer to closed
705705
## Update the preview Web
706706

707707
- commit the `develop` branch of `xpack/web-jekyll` GitHub repo;
708-
use a message like _xPack GNU RISC-V Embedded GCC v12.3.0-1 released_
708+
use a message like _xPack GNU RISC-V Embedded GCC v12.3.0-2 released_
709709
- push to GitHub
710710
- wait for the GitHub Pages build to complete
711711
- the preview web is <https://xpack.github.io/web-preview/news/>
@@ -746,18 +746,18 @@ watching this project.
746746
- compare the SHA sums with those shown by `cat *.sha`
747747
- check the executable names
748748
- commit all changes, use a message like
749-
_package.json: update urls for 12.3.0-1 release_ (without _v_)
749+
_package.json: update urls for 12.3.0-2 release_ (without _v_)
750750

751751
## Publish on the npmjs.com server
752752

753753
- select the `xpack-develop` branch
754754
- check the latest commits `npm run git-log`
755-
- update `CHANGELOG.md`, add a line like _* v12.3.0-1.1 published on npmjs.com_
756-
- commit with a message like _CHANGELOG: publish npm v12.3.0-1.1_
755+
- update `CHANGELOG.md`, add a line like _* v12.3.0-2.1 published on npmjs.com_
756+
- commit with a message like _CHANGELOG: publish npm v12.3.0-2.1_
757757
- `npm pack` and check the content of the archive, which should list
758758
only the `package.json`, the `README.md`, `LICENSE` and `CHANGELOG.md`;
759759
possibly adjust `.npmignore`
760-
- `npm version 12.3.0-1.1`; the first 4 numbers are the same as the
760+
- `npm version 12.3.0-2.1`; the first 4 numbers are the same as the
761761
GitHub release; the fifth number is the npm specific version
762762
- the commits and the tag should have been pushed by the `postversion` script;
763763
if not, push them with `git push origin --tags`
@@ -786,12 +786,12 @@ The tests results are available from the
786786
When the release is considered stable, promote it as `latest`:
787787

788788
- `npm dist-tag ls @xpack-dev-tools/riscv-none-elf-gcc`
789-
- `npm dist-tag add @xpack-dev-tools/[email protected]1.1 latest`
789+
- `npm dist-tag add @xpack-dev-tools/[email protected]2.1 latest`
790790
- `npm dist-tag ls @xpack-dev-tools/riscv-none-elf-gcc`
791791

792792
In case the previous version is not functional and needs to be unpublished:
793793

794-
- `npm unpublish @xpack-dev-tools/[email protected]1.1`
794+
- `npm unpublish @xpack-dev-tools/[email protected]2.1`
795795

796796
## Update the Web
797797

@@ -813,7 +813,7 @@ In case the previous version is not functional and needs to be unpublished:
813813

814814
- in a separate browser windows, open [TweetDeck](https://tweetdeck.twitter.com/)
815815
- using the `@xpack_project` account
816-
- paste the release name like **xPack GNU RISC-V Embedded GCC v12.3.0-1 released**
816+
- paste the release name like **xPack GNU RISC-V Embedded GCC v12.3.0-2 released**
817817
- paste the link to the Web page
818818
[release](https://xpack.github.io/riscv-none-elf-gcc/releases/)
819819
- click the **Tweet** button
@@ -841,9 +841,9 @@ Add a new topic in the **Announcements** category of the
841841
[RISC-V forums]<https://groups.google.com/a/groups.riscv.org/g/sw-dev>).
842842

843843
```console
844-
Subject: xPack GNU RISC-V Embedded GCC v12.3.0-1 released
844+
Subject: xPack GNU RISC-V Embedded GCC v12.3.0-2 released
845845

846-
Version 12.3.0-1 is a new release of the xPack GNU RISC-V Embedded GCC; it follows the GNU GCC release.
846+
Version 12.3.0-2 is a new release of the xPack GNU RISC-V Embedded GCC; it follows the GNU GCC release.
847847

848848
https://xpack.github.io/blog/2022/05/14/riscv-none-elf-gcc-v11-3-0-1-released/
849849
```

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ After install, the package should create a structure like this (only the
110110
first two depth levels are shown):
111111

112112
```console
113-
$ tree -L 2 /Users/ilg/Library/xPacks/\@xpack-dev-tools/riscv-none-elf-gcc/12.3.0-1/.content/
114-
/Users/ilg/Library/xPacks/\@xpack-dev-tools/riscv-none-elf-gcc/12.3.0-1/.content/
113+
$ tree -L 2 /Users/ilg/Library/xPacks/\@xpack-dev-tools/riscv-none-elf-gcc/12.3.0-2/.content/
114+
/Users/ilg/Library/xPacks/\@xpack-dev-tools/riscv-none-elf-gcc/12.3.0-2/.content/
115115
├── README.md
116116
├── bin
117117
│   ├── riscv-none-elf-addr2line
@@ -232,13 +232,13 @@ The version strings used by the GCC project are three number strings
232232
like `12.3.0`; to this string the xPack distribution adds a four number,
233233
but since semver allows only three numbers, all additional ones can
234234
be added only as pre-release strings, separated by a dash,
235-
like `12.3.0-1`.
235+
like `12.3.0-2`.
236236
When published as a npm package, the version gets
237-
a fifth number, like `12.3.0-1.1`.
237+
a fifth number, like `12.3.0-2.1`.
238238

239239
Since adherence of third party packages to semver is not guaranteed,
240240
it is recommended to use semver expressions like `^12.3.0` and `~12.3.0`
241-
with caution, and prefer exact matches, like `12.3.0-1.1`.
241+
with caution, and prefer exact matches, like `12.3.0-2.1`.
242242

243243
## Maintainer info
244244

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@xpack-dev-tools/riscv-none-elf-gcc",
3-
"version": "13.2.0-1.1",
3+
"version": "12.3.0-2.1.pre",
44
"description": "A binary xPack with the GNU RISC-V Embedded GCC executables",
55
"main": "",
66
"scripts": {

scripts/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
13.2.0-1
1+
12.3.0-2

0 commit comments

Comments
 (0)