Skip to content

fix: Use the right token for the workflow #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sanbotto merged 2 commits into from
Dec 2, 2025
Merged

fix: Use the right token for the workflow #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4380dcd
fix: Use the right token for the workflow
sanbotto Nov 26, 2025
1ace2b6
Add debugging lines
sanbotto Dec 2, 2025
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
73 changes: 60 additions & 13 deletions .github/workflows/build-and-push-images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ jobs:
if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository
run: |
if [ ! -f "VERSION" ]; then
echo "❌ VERSION file not found in repository root"
echo "VERSION file not found in repository root"
echo "Please create a VERSION file with a semantic version (e.g., v1.0.0)"
exit 1
fi
echo "✅ VERSION file exists"
echo "VERSION file exists"

- name: Check VERSION file updated and greater
id: check_version_file_updated_and_greater
Expand All @@ -91,7 +91,7 @@ jobs:

# Check if versions are the same
if [ "$PR_VERSION" == "$MAIN_VERSION" ]; then
echo "❌ VERSION file has not been updated"
echo "VERSION file has not been updated"
echo "Current VERSION: $PR_VERSION"
echo "Main branch VERSION: $MAIN_VERSION"
echo "Please update the VERSION file with a new semantic version"
Expand All @@ -101,7 +101,7 @@ jobs:
echo "PR_VERSION=$PR_VERSION" >> "$GITHUB_OUTPUT"
echo "MAIN_VERSION=$MAIN_VERSION" >> "$GITHUB_OUTPUT"
else
echo "✅ VERSION file is new (not present in main branch)"
echo "VERSION file is new (not present in main branch)"
fi

- name: Compare PR and main VERSION using shared action
Expand All @@ -120,20 +120,20 @@ jobs:
RESULT="${{ steps.compare_pr_main_version.outputs.result }}"

if [ "$RESULT" = "eq" ]; then
echo "❌ VERSION is the same as main branch (after removing metadata)"
echo "VERSION is the same as main branch (after removing metadata)"
echo "PR VERSION: $PR_VERSION"
echo "Main branch VERSION: $MAIN_VERSION"
echo "Please update the VERSION file with a greater semantic version"
exit 1
elif [ "$RESULT" = "lt" ]; then
echo "❌ VERSION is less than main branch version"
echo "VERSION is less than main branch version"
echo "PR VERSION: $PR_VERSION"
echo "Main branch VERSION: $MAIN_VERSION"
echo "Please update the VERSION file with a greater semantic version"
exit 1
fi

echo "✅ VERSION file has been updated and is greater"
echo "VERSION file has been updated and is greater"
echo "Main branch: $MAIN_VERSION"
echo "PR branch: $PR_VERSION"

Expand All @@ -144,7 +144,7 @@ jobs:

# Check that version starts with 'v'
if [[ ! "$VERSION" == v* ]]; then
echo "❌ Version must start with 'v' prefix"
echo "Version must start with 'v' prefix"
echo "Current version: $VERSION"
echo "Expected format: v1.0.0 (semantic versioning with 'v' prefix)"
exit 1
Expand All @@ -155,17 +155,17 @@ jobs:

# Validate semantic versioning format (major.minor.patch)
if [[ ! $VERSION_CLEAN =~ ^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.-]+)?(\+[a-zA-Z0-9.-]+)?$ ]]; then
echo "❌ Invalid version format: $VERSION"
echo "Invalid version format: $VERSION"
echo "Expected format: v1.0.0 (semantic versioning with 'v' prefix)"
exit 1
fi

echo "✅ Valid version: $VERSION"
echo "Valid version: $VERSION"

- name: Skip check for non-PR events
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository
run: |
echo "⏭️ Skipping VERSION check (not a PR or PR is from a fork)"
echo "Skipping VERSION check (not a PR or PR is from a fork)"

parse_tags:
name: Parse tags
Expand All @@ -174,26 +174,43 @@ jobs:
tags: ${{ steps.parse_tags.outputs.tags }}
has_custom_tags: ${{ steps.parse_tags.outputs.has_custom_tags }}
steps:
- name: Debug - Show received tags
run: |
echo "Event name: ${{ github.event_name }}"
echo "Received tag input: '${{ github.event.inputs.tag }}'"
if [ -n "${{ github.event.inputs.tag }}" ]; then
echo "Tags breakdown:"
TAGS="${{ github.event.inputs.tag }}"
IFS=',' read -ra TAG_ARRAY <<< "$TAGS"
for tag in "${TAG_ARRAY[@]}"; do
echo " - $tag"
done
fi

- name: Parse tags
id: parse_tags
shell: bash
run: |
if [ "${{ github.event_name }}" == "workflow_dispatch" ] && [ -n "${{ github.event.inputs.tag }}" ]; then
echo "Parsing tags from input: '${{ github.event.inputs.tag }}'"
# Parse comma-separated tags and output as multiline string for docker/metadata-action
IFS=',' read -ra TAGS <<< "${{ github.event.inputs.tag }}"
TAGS_OUTPUT=""
for tag in "${TAGS[@]}"; do
tag=$(echo "$tag" | xargs) # trim whitespace
if [ -n "$tag" ]; then
TAGS_OUTPUT="${TAGS_OUTPUT}type=raw,value=${tag}"$'\n'
echo "Added tag: ${tag}"
fi
done
echo "tags<<EOF" >> $GITHUB_OUTPUT
echo "$TAGS_OUTPUT" >> $GITHUB_OUTPUT
echo "EOF" >> $GITHUB_OUTPUT
echo "has_custom_tags=true" >> $GITHUB_OUTPUT
echo "Parsed tags successfully"
else
echo "has_custom_tags=false" >> $GITHUB_OUTPUT
echo "No custom tags provided (event: ${{ github.event_name }}, has tag input: $([ -n '${{ github.event.inputs.tag }}' ] && echo 'yes' || echo 'no'))"
fi

health-checker:
Expand Down Expand Up @@ -226,13 +243,23 @@ jobs:
username: ${{ github.repository_owner }}
password: ${{ secrets.AETHERLAY_GITHUB_TOKEN }}

- name: Debug - Show tags for health-checker
run: |
echo "Tags from parse_tags job:"
echo "${{ needs.parse_tags.outputs.tags }}"
echo ""
echo "Has custom tags: ${{ needs.parse_tags.outputs.has_custom_tags }}"
echo "Event name: ${{ github.event_name }}"
echo "Ref name: ${{ github.ref_name }}"
echo "Default branch: ${{ github.event.repository.default_branch }}"

- name: Docker meta for health-checker
id: meta_hc
uses: docker/metadata-action@v5
with:
images: ghcr.io/project-aethermesh/aetherlay/aetherlay-hc
tags: |
type=raw,value=latest,enable=${{ github.ref_name == github.event.repository.default_branch && github.event_name != 'pull_request' }}
type=raw,value=latest,enable=${{ github.ref_name == github.event.repository.default_branch && github.event_name != 'pull_request' && needs.parse_tags.outputs.has_custom_tags != 'true' }}
type=sha,format=short,enable=${{ github.ref_name == github.event.repository.default_branch && github.event_name != 'pull_request' }}
type=raw,value=pr-${{ github.event.pull_request.number }},enable=${{ github.event_name == 'pull_request' }}
${{ needs.parse_tags.outputs.tags }}
Expand All @@ -241,6 +268,11 @@ jobs:
org.opencontainers.image.vendor=Project Aethermesh
org.opencontainers.image.licenses=AGPL-3.0

- name: Debug - Show final tags for health-checker
run: |
echo "Final tags that will be applied:"
echo "${{ steps.meta_hc.outputs.tags }}"

- name: Build and push health-checker image
id: container_image_hc
uses: docker/build-push-action@v6
Expand Down Expand Up @@ -281,13 +313,23 @@ jobs:
username: ${{ github.repository_owner }}
password: ${{ secrets.AETHERLAY_GITHUB_TOKEN }}

- name: Debug - Show tags for load-balancer
run: |
echo "Tags from parse_tags job:"
echo "${{ needs.parse_tags.outputs.tags }}"
echo ""
echo "Has custom tags: ${{ needs.parse_tags.outputs.has_custom_tags }}"
echo "Event name: ${{ github.event_name }}"
echo "Ref name: ${{ github.ref_name }}"
echo "Default branch: ${{ github.event.repository.default_branch }}"

- name: Docker meta for load-balancer
id: meta_lb
uses: docker/metadata-action@v5
with:
images: ghcr.io/project-aethermesh/aetherlay/aetherlay-lb
tags: |
type=raw,value=latest,enable=${{ github.ref_name == github.event.repository.default_branch && github.event_name != 'pull_request' }}
type=raw,value=latest,enable=${{ github.ref_name == github.event.repository.default_branch && github.event_name != 'pull_request' && needs.parse_tags.outputs.has_custom_tags != 'true' }}
type=sha,format=short,enable=${{ github.ref_name == github.event.repository.default_branch && github.event_name != 'pull_request' }}
type=raw,value=pr-${{ github.event.pull_request.number }},enable=${{ github.event_name == 'pull_request' }}
${{ needs.parse_tags.outputs.tags }}
Expand All @@ -296,6 +338,11 @@ jobs:
org.opencontainers.image.vendor=Project Aethermesh
org.opencontainers.image.licenses=AGPL-3.0

- name: Debug - Show final tags for load-balancer
run: |
echo "Final tags that will be applied:"
echo "${{ steps.meta_lb.outputs.tags }}"

- name: Build and push load-balancer image
id: container_image_lb
uses: docker/build-push-action@v6
Expand Down
43 changes: 30 additions & 13 deletions .github/workflows/create-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ jobs:
id: check_version_file
run: |
if [ ! -f "VERSION" ]; then
echo "❌ VERSION file not found in repository root"
echo "VERSION file not found in repository root"
exit 1
fi
echo "✅ VERSION file exists"
echo "VERSION file exists"

- name: Read and validate VERSION
id: read_version
Expand All @@ -40,7 +40,7 @@ jobs:
VERSION=$(cat VERSION | xargs)
# Check that version starts with 'v'
if [[ ! "$VERSION" == v* ]]; then
echo "❌ Version must start with 'v' prefix"
echo "Version must start with 'v' prefix"
echo "Current version: $VERSION"
echo "Expected format: v1.0.0 (semantic versioning with 'v' prefix)"
exit 1
Expand All @@ -51,7 +51,7 @@ jobs:

# Validate semantic versioning format (major.minor.patch)
if [[ ! "$VERSION_CLEAN" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.-]+)?(\+[a-zA-Z0-9.-]+)?$ ]]; then
echo "❌ Invalid version format: $VERSION"
echo "Invalid version format: $VERSION"
echo "Expected format: v1.0.0 (semantic versioning with 'v' prefix)"
exit 1
fi
Expand All @@ -60,7 +60,7 @@ jobs:
LATEST_TAG=$(git tag -l 'v*' --sort=-version:refname | head -n 1 || echo "")
echo "latest_tag=$LATEST_TAG" >> "$GITHUB_OUTPUT"
echo "version=$VERSION" >> $GITHUB_OUTPUT
echo "✅ Valid version: $VERSION"
echo "Valid version: $VERSION"

- name: Compare VERSION with latest release using shared action
id: compare_with_latest
Expand All @@ -79,27 +79,27 @@ jobs:
RESULT="${{ steps.compare_with_latest.outputs.result }}"

if [ "$RESULT" = "eq" ]; then
echo "❌ VERSION is the same as latest release"
echo "VERSION is the same as latest release"
echo "Current VERSION: $VERSION"
echo "Latest release: $LATEST_TAG"
echo "Please update the VERSION file with a greater semantic version"
exit 1
elif [ "$RESULT" = "lt" ]; then
echo "❌ VERSION is less than latest release"
echo "VERSION is less than latest release"
echo "Current VERSION: $VERSION"
echo "Latest release: $LATEST_TAG"
echo "Please update the VERSION file with a greater semantic version"
exit 1
fi

echo "✅ VERSION is greater than latest release"
echo "VERSION is greater than latest release"
echo "Latest release: $LATEST_TAG"
echo "New version: $VERSION"

- name: Note when no previous releases exist
if: steps.read_version.outputs.latest_tag == ''
run: |
echo "✅ No previous releases found, this will be the first release"
echo "No previous releases found, this will be the first release"

- name: Generate tags
id: generate_tags
Expand Down Expand Up @@ -142,23 +142,27 @@ jobs:
name: Create GitHub Release
runs-on: ubuntu-latest
needs: validate_version
permissions:
contents: write
steps:
- name: Checkout code
uses: actions/checkout@v6
with:
fetch-depth: 0
token: ${{ secrets.AETHERLAY_GITHUB_TOKEN }}
persist-credentials: true

- name: Create Git Tag
run: |
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
VERSION="${{ needs.validate_version.outputs.version }}"
if git rev-parse "$VERSION" >/dev/null 2>&1; then
echo "❌ Tag $VERSION already exists"
echo "Tag $VERSION already exists"
exit 1
fi
git tag -a "$VERSION" -m "Release $VERSION"
git push origin "$VERSION" || { echo "❌ Failed to push tag"; exit 1; }
git push origin "$VERSION" || { echo "Failed to push tag"; exit 1; }

- name: Create GitHub Release
uses: softprops/action-gh-release@v2
Expand All @@ -170,13 +174,26 @@ jobs:
draft: false
prerelease: ${{ needs.validate_version.outputs.is_prerelease == 'true' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.AETHERLAY_GITHUB_TOKEN }}

- name: Debug - Output tags for build workflow
run: |
echo "Tags to be passed to build workflow:"
echo "${{ needs.validate_version.outputs.tags }}"
echo ""
echo "Tags breakdown:"
TAGS="${{ needs.validate_version.outputs.tags }}"
IFS=',' read -ra TAG_ARRAY <<< "$TAGS"
for tag in "${TAG_ARRAY[@]}"; do
echo " - $tag"
done

- name: Trigger build workflow
uses: actions/github-script@v8
with:
script: |
const tags = '${{ needs.validate_version.outputs.tags }}';
console.log(`Triggering build workflow with tags: ${tags}`);
await github.rest.actions.createWorkflowDispatch({
owner: context.repo.owner,
repo: context.repo.repo,
Expand All @@ -186,4 +203,4 @@ jobs:
tag: tags
}
});
console.log(`Triggered build workflow with tags: ${tags}`);
console.log(`Build workflow triggered successfully with tags: ${tags}`);
Loading