Skip to content

Commit e9b8826

Browse files
authored
Exclude macOS metadata from release archives (#828)
1 parent 867872e commit e9b8826

4 files changed

Lines changed: 7 additions & 2 deletions

File tree

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Release Notes.
66
------------------
77

88
* Add Spring LDAP 3.3.x-4.x plugin.
9+
* Exclude macOS metadata files from source and binary release archives (apache/skywalking#14080).
910
* Fix `NoSuchMethodError: org.apache.skywalking.apm.plugin.spring.webflux.v6.DispatcherHandlerHandleMethodInterceptor`
1011
on Spring Framework 7 (Spring Boot 4). `HttpHeaders` no longer implements `MultiValueMap`, so
1112
`List get(Object)` was removed; the entry span was never created and the service produced no

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ build:
2828

2929
.PHONY: dist
3030
dist: build
31-
tar czf apache-skywalking-java-agent-$(TAG).tgz $(AGENT_PACKAGE)
31+
COPYFILE_DISABLE=1 tar czf apache-skywalking-java-agent-$(TAG).tgz --exclude '._*' --exclude .DS_Store $(AGENT_PACKAGE)
3232
gpg --armor --detach-sig apache-skywalking-java-agent-$(TAG).tgz
3333
shasum -a 512 apache-skywalking-java-agent-$(TAG).tgz > apache-skywalking-java-agent-$(TAG).tgz.sha512
3434

docs/en/contribution/release-java-agent.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ Then run `gpgconf --kill gpg-agent` and `gpg --sign /dev/null` to cache it.
7676
4. **upload** — upload to Apache SVN `dist/dev` (prompts for SVN credentials)
7777
5. **email vote** — print vote email template with pre-filled version, commit ID, submodule commit, and checksums
7878

79+
Source and binary packaging uses `COPYFILE_DISABLE=1` to prevent macOS `tar` from
80+
generating AppleDouble metadata, and excludes existing `._*` and `.DS_Store` files.
81+
7982
Before the long build starts, **prepare** asks for the GitHub milestone ID of the next
8083
development version, which it writes into the reset `CHANGES.md`. Look up the
8184
`Java - <next_version>` milestone at https://github.com/apache/skywalking/milestones and

tools/releasing/release.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,9 +425,10 @@ cmd_stage() {
425425

426426
# Source tar
427427
info "Creating source tar..."
428-
tar czf "${product_dir}-src.tgz" \
428+
COPYFILE_DISABLE=1 tar czf "${product_dir}-src.tgz" \
429429
--exclude .git \
430430
--exclude .DS_Store \
431+
--exclude '._*' \
431432
--exclude .github \
432433
--exclude .gitignore \
433434
--exclude .gitmodules \

0 commit comments

Comments
 (0)