Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,10 @@ updates:
day: "monday"
cooldown:
default-days: 7
- package-ecosystem: "pip"
directory: "/upload-source-to-atr"
schedule:
interval: "weekly"
day: "monday"
cooldown:
default-days: 7
10 changes: 9 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,14 @@ repos:
- "|#|"
- --license-filepath
- share/apache-2.0_header.txt
- id: insert-license
name: Add license header to all shell and Python files
files: ^.*\.(sh|py)$
args:
- --comment-style
- "#"
- --license-filepath
- share/apache-2.0_header.txt

- repo: https://github.com/adrienverge/yamllint
rev: v1.37.1
Expand All @@ -72,7 +80,7 @@ repos:
args: ["--verbose"]

- repo: https://github.com/woodruffw/zizmor-pre-commit
rev: v1.23.0
rev: v1.30.1
hooks:
- id: zizmor
args: [--min-severity, low]
37 changes: 37 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,40 @@ jobs:
# Add specific inputs here that are required by the action
# project: example
# version: ${{ github.ref_name }}

### `apache/tooling-actions/upload-source-to-atr`

![Status: Experimental](https://img.shields.io/badge/Status-EXPERIMENTAL-orange)

Compose a source release candidate:
create a reproducible source archive with `git archive`,
compute its SHA-512 checksum and SWHID,
sign it with the project's GPG key
and upload the files to ATR.
See the [action README](upload-source-to-atr/README.md) for all inputs.

#### Usage Example

```yaml
jobs:
compose:
runs-on: ubuntu-latest
environment: release
permissions:
id-token: write # Required for OIDC
contents: read
steps:
- name: Checkout code
uses: actions/checkout@<COMMIT_HASH>
with:
persist-credentials: false

- name: Compose, sign and upload the source release
uses: apache/tooling-actions/upload-source-to-atr@<COMMIT_HASH>
with:
project: example
version: 1.2.3
gpg-private-key: ${{ secrets.EXAMPLE_GPG_SECRET_KEY }}
gpg-passphrase: ${{ secrets.EXAMPLE_GPG_PASSPHRASE }}
gpg-fingerprint: ${{ vars.EXAMPLE_GPG_FINGERPRINT }}
```
137 changes: 137 additions & 0 deletions upload-source-to-atr/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
# Compose, sign, and upload a source release to ATR

```
apache/tooling-actions/upload-source-to-atr
```

This composite GitHub Action creates a reproducible source archive of the checked-out commit with `git archive`,
computes its SHA-512 checksum and the [SWHID](https://swhid.org/) of its content,
signs it with a GPG key,
and uploads the three files to ATR at `/<project>/<version>/` using the [`upload-to-atr`](../upload-to-atr/README.md) action.
Use it to compose a source release candidate from a tag or branch without long-lived ATR credentials.

Status: EXPERIMENTAL

## Inputs

- **project (required)**: ATR project name segment in the remote path.
- **version (required)**: ATR release version segment in the remote path, for example `1.2.3`.
- **archive-prefix**: Archive file name without the `.tar.gz` suffix.
Default: `apache-<project>-<version>-src`.
- **archive-directory**: Name of the single top-level directory inside the archive.
Default: same as `archive-prefix`.
- **gpg-private-key (required)**: ASCII-armored GPG private key used for signing.
- **gpg-passphrase**: Passphrase of the GPG private key, if it has one.
Default: empty.
- **gpg-fingerprint**: Expected fingerprint of the primary signing key.
When set, the action fails if the imported key has a different fingerprint.
Default: empty (no check).
- **swhid**: If `"true"`, compute the directory SWHID of the expanded archive.
Default: `"true"`.
- **atr-host**: ATR host to upload to.
Default: `releases.apache.org`.
Must match `*.apache.org`.
- **ssh-port**: SSH port on ATR.
Default: `2222`.

## Outputs

- **directory**: Directory containing `<archive-prefix>.tar.gz`, `<archive-prefix>.tar.gz.sha512` and `<archive-prefix>.tar.gz.asc`.
- **archive**: File name of the archive.
- **commit**: Commit that was archived.
- **sha512**: SHA-512 checksum of the archive.
- **swhid**: Directory SWHID (`swh:1:dir:...`) of the expanded archive.
Empty when `swhid` is `"false"`.

## Example workflow

The `id-token` write permission is **required** when using this GitHub Action.
Tagged versions of this action are not available.
Replace `<COMMIT>` in this example with your chosen commit.

```yaml
name: Compose source release

on:
push:
tags: ["v*.*.*-rc.*"]

permissions:
contents: read

jobs:
compose:
if: github.repository == 'apache/example'
runs-on: ubuntu-latest
# Keep the signing secrets in an environment that requires approval.
environment:
name: release
url: https://releases.apache.org/projects/example
permissions:
contents: read
id-token: write
steps:
- uses: actions/checkout@<COMMIT>
with:
persist-credentials: false

- name: Extract version
id: version
run: |
version="${GITHUB_REF_NAME#v}"
echo "version=${version%-rc.*}" >> "$GITHUB_OUTPUT"

- name: Compose, sign and upload the source release
uses: apache/tooling-actions/upload-source-to-atr@<COMMIT>
with:
project: example
version: ${{ steps.version.outputs.version }}
# archive-prefix defaults to apache-example-<version>-src
gpg-private-key: ${{ secrets.EXAMPLE_GPG_SECRET_KEY }}
gpg-passphrase: ${{ secrets.EXAMPLE_GPG_PASSPHRASE }}
gpg-fingerprint: ${{ vars.EXAMPLE_GPG_FINGERPRINT }}
```

## Reproducibility

Anyone who archives the same commit with the same version of `gzip` obtains a byte-for-byte identical file.
The action follows the [reproducible archives](https://reproducible-builds.org/docs/archives/) guidance:

- `git archive` sets the modification time of every entry to the commit time and the owner to `root`,
- `tar.umask=0022` gives every entry the same permissions regardless of the runner,
- `gzip -n` leaves the file name and timestamp out of the gzip header.

[Trusted Publishing](https://releases.apache.org/docs/trusted-publishing) at the ASF requires releases built on CI to be reproducible,
and the ASF Security team confirms this for each pipeline.
A release that consists of this source archive alone meets the requirement out of the box.

### Signing secrets

The signing key is provisioned by ASF Infrastructure as part of [Trusted Publishing](https://releases.apache.org/docs/trusted-publishing).
Open an [INFRA ticket](https://issues.apache.org/jira/projects/INFRA/issues) and ask for a release signing key for your repository, with:

- two repository secrets holding the private key and its passphrase,
named after the PMC, for example `EXAMPLE_GPG_SECRET_KEY` and `EXAMPLE_GPG_PASSPHRASE`,
- one organization variable holding the fingerprint of the key, for example `EXAMPLE_GPG_FINGERPRINT`,
shared with all the repositories of the PMC.

You receive the public key, which should be added to ATR.

A composite action cannot read secrets or variables on its own,
so pass them to the `gpg-private-key`, `gpg-passphrase` and `gpg-fingerprint` inputs as in the example above.

## SWHID

The action also computes the [Software Heritage identifier](https://swhid.org/) (SWHID, ISO/IEC 18670:2025) of the source tree in the archive.
A directory SWHID is derived from the names, modes, and contents of the files alone.
Timestamps, ownership, and compression play no part,
so the same sources produce the same SWHID whichever archive format carries them.

Git builds its tree ids the same way,
so the SWHID is `swh:1:dir:<tree id>` of the archived commit as long as `git archive` exported the tree as is.
The two diverge when git attributes rewrite the exported files, for example:

- `export-ignore` and `export-subst`,
- `text` and `eol` attributes or `core.autocrlf`.

To skip the SWHID computation, set `swhid` to `false`.
99 changes: 99 additions & 0 deletions upload-source-to-atr/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
---
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

name: "Compose, sign and upload a source release to ATR"
description: "Create a reproducible source tarball with git archive, compute its SHA-512 checksum and SWHID, sign it and upload the files to ATR."
branding: {icon: upload-cloud, color: blue}

inputs:
project: {description: "ATR project", required: true}
version: {description: "ATR release version", required: true}
archive-prefix: {description: "Archive file name without the .tar.gz suffix (default: apache-<project>-<version>-src)", default: ""}
archive-directory: {description: "Name of the single top-level directory inside the archive (default: same as archive-prefix)", default: ""}
gpg-private-key: {description: "ASCII-armored GPG private key used for signing (usually secrets.<PMC>_GPG_SECRET_KEY)", required: true}
gpg-passphrase: {description: "Passphrase of the GPG private key, if any (usually secrets.<PMC>_GPG_PASSPHRASE)", default: ""}
gpg-fingerprint: {description: "Expected fingerprint of the primary signing key; the action fails if the imported key differs (usually vars.<PMC>_GPG_FINGERPRINT)", default: ""}
swhid: {description: "Compute the SWHID of the expanded archive (true or false)", default: "true"}
atr-host: {description: "ATR host", default: "releases.apache.org"}
ssh-port: {description: "SSH port", default: "2222"}

outputs:
directory: {description: "Directory containing the archive, its checksum and its signature", value: "${{ steps.archive.outputs.directory }}"}
archive: {description: "File name of the archive", value: "${{ steps.archive.outputs.archive }}"}
commit: {description: "Commit that was archived", value: "${{ steps.archive.outputs.commit }}"}
sha512: {description: "SHA-512 checksum of the archive", value: "${{ steps.archive.outputs.sha512 }}"}
swhid: {description: "Directory SWHID of the expanded archive (empty if swhid is false)", value: "${{ steps.swhid.outputs.swhid }}"}

runs:
using: "composite"
steps:
- name: Create the source archive
id: archive
shell: bash
run: "$GITHUB_ACTION_PATH/archive.sh"
env:
INPUTS_PROJECT: ${{ inputs.project }}
INPUTS_VERSION: ${{ inputs.version }}
INPUTS_ARCHIVE_PREFIX: ${{ inputs.archive-prefix }}
INPUTS_ARCHIVE_DIRECTORY: ${{ inputs.archive-directory }}

- name: Set up Python for the SWHID computation
if: ${{ inputs.swhid == 'true' }}
uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
with:
python-version: "3.12"

- name: Compute the SWHID of the expanded archive
id: swhid
if: ${{ inputs.swhid == 'true' }}
shell: bash
run: |
set -euo pipefail
python -m venv "${RUNNER_TEMP}/upload-source-to-atr-venv"
"${RUNNER_TEMP}/upload-source-to-atr-venv/bin/python" -m pip install --quiet --require-hashes -r "${GITHUB_ACTION_PATH}/requirements.txt"
"${RUNNER_TEMP}/upload-source-to-atr-venv/bin/python" "${GITHUB_ACTION_PATH}/swhid.py"
env:
DIRECTORY: ${{ steps.archive.outputs.directory }}
ARCHIVE: ${{ steps.archive.outputs.archive }}
ARCHIVE_DIRECTORY: ${{ steps.archive.outputs.archive-directory }}
TREE: ${{ steps.archive.outputs.tree }}

- name: Import the GPG signing key
id: gpg
uses: crazy-max/ghaction-import-gpg@2dc316deee8e90f13e1a351ab510b4d5bc0c82cd # v7.0.0
with:
gpg_private_key: ${{ inputs.gpg-private-key }}
passphrase: ${{ inputs.gpg-passphrase }}

- name: Sign the source archive
shell: bash
run: "$GITHUB_ACTION_PATH/sign.sh"
env:
DIRECTORY: ${{ steps.archive.outputs.directory }}
ARCHIVE: ${{ steps.archive.outputs.archive }}
IMPORTED_FINGERPRINT: ${{ steps.gpg.outputs.fingerprint }}
EXPECTED_FINGERPRINT: ${{ inputs.gpg-fingerprint }}

- name: Upload to ATR
uses: $/upload-to-atr
with:
project: ${{ inputs.project }}
version: ${{ inputs.version }}
src: ${{ steps.archive.outputs.directory }}
atr-host: ${{ inputs.atr-host }}
ssh-port: ${{ inputs.ssh-port }}
84 changes: 84 additions & 0 deletions upload-source-to-atr/archive.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
#!/usr/bin/env bash

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion - maybe we should rewrite those scripts to Python + uv run ? While I am very long time and very experience bash script creator, i absolutely hate lack of readability and testability it has. Also bash is not very portable - especially for MacOS where default bash is very old due to licencing reasons, and people have to replace the MacOS bash with brew version of it to get some modern(ish) features (like 10 years old).

With Python scripts, inline metadata - it has even better portability and readability, and if you make a mini-project with pyproject.toml you can also add unit tests, which are absolutely necessary if we want to leverage agentic work. Test harness is crucial to be able to maintain any piece of software with agents.

# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

# Create a reproducible source archive of HEAD and its SHA-512 checksum.
# See https://reproducible-builds.org/docs/archives/
#
# Inputs (environment): INPUTS_PROJECT, INPUTS_VERSION, INPUTS_ARCHIVE_PREFIX, INPUTS_ARCHIVE_DIRECTORY
# Outputs (GITHUB_OUTPUT): directory, archive, archive-directory, commit, tree, sha512

set -euo pipefail

: "${INPUTS_PROJECT:?project is required}"
: "${INPUTS_VERSION:?version is required}"
name_pattern='^[A-Za-z0-9][A-Za-z0-9._+-]*$'
for name in "$INPUTS_PROJECT" "$INPUTS_VERSION"; do
if ! [[ "$name" =~ $name_pattern ]]; then
echo "::error::project and version must only contain letters, digits, '.', '_', '+' or '-'"
exit 1
fi
done
archive_prefix="${INPUTS_ARCHIVE_PREFIX:-apache-${INPUTS_PROJECT}-${INPUTS_VERSION}-src}"
archive_directory="${INPUTS_ARCHIVE_DIRECTORY:-${archive_prefix}}"
for name in "$archive_prefix" "$archive_directory"; do
if ! [[ "$name" =~ $name_pattern ]]; then
echo "::error::archive-prefix and archive-directory must only contain letters, digits, '.', '_', '+' or '-'"
exit 1
fi
done
case "$archive_prefix" in
*.tar.gz|*.tgz|*.tar)
echo "::error::archive-prefix must not include the .tar.gz suffix; it is appended automatically"
exit 1;;
esac
if ! commit="$(git rev-parse --verify --quiet 'HEAD^{commit}')"; then
echo "::error::No git commit found in the working directory; check out the repository first (actions/checkout)"
exit 1
fi
tree="$(git rev-parse "${commit}^{tree}")"

archive="${archive_prefix}.tar.gz"
directory="${RUNNER_TEMP}/upload-source-to-atr"
rm -rf "$directory"
mkdir "$directory"

# git archive uses the commit time as mtime and root as owner,
# tar.umask normalizes permissions,
# and gzip -n omits the file name and timestamp from the gzip header.
git -c tar.umask=0022 archive --format=tar --prefix="${archive_directory}/" "$commit" |
gzip -n -9 > "${directory}/${archive}"

cd "$directory"
sha512sum "$archive" > "${archive}.sha512"
sha512="$(cut -d ' ' -f 1 "${archive}.sha512")"

{
echo "directory=${directory}"
echo "archive=${archive}"
echo "archive-directory=${archive_directory}"
echo "commit=${commit}"
echo "tree=${tree}"
echo "sha512=${sha512}"
} >> "$GITHUB_OUTPUT"
{
echo "### Source release"
echo
echo "- Commit: \`${commit}\`"
echo "- Archive: \`${archive}\` (top-level directory \`${archive_directory}/\`)"
echo "- SHA-512: \`${sha512}\`"
} >> "$GITHUB_STEP_SUMMARY"
Loading
Loading