Compare commits
167 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e7c60f1f4e | ||
|
|
24fdb1d0d2 | ||
|
|
56199cd0ea | ||
|
|
3115e328d9 | ||
|
|
7bb29ce601 | ||
|
|
66ab8d5cc6 | ||
|
|
991faf6904 | ||
|
|
1092f87c31 | ||
|
|
86247544e8 | ||
|
|
2ca89d843d | ||
|
|
c29d36e54d | ||
|
|
5a0644558b | ||
|
|
54b65f3749 | ||
|
|
e71a2f0926 | ||
|
|
98c8ab9be6 | ||
|
|
e1b09f5995 | ||
|
|
1a16ef59af | ||
|
|
2a7ee02374 | ||
|
|
35483cda2a | ||
|
|
d8b5401110 | ||
|
|
b2b49e576a | ||
|
|
8acbaba1d7 | ||
|
|
60e63f5529 | ||
|
|
d22c7c9db6 | ||
|
|
917a2d5059 | ||
|
|
baeb3e6bac | ||
|
|
d00666f662 | ||
|
|
9f2bbf1846 | ||
|
|
a90535d52a | ||
|
|
c5bcf94651 | ||
|
|
743effd599 | ||
|
|
5d91164fe9 | ||
|
|
9ef29f7199 | ||
|
|
01d747a95a | ||
|
|
508fe372ac | ||
|
|
4eecfd53eb | ||
|
|
4aafef090c | ||
|
|
d76ff0c2de | ||
|
|
4056568d35 | ||
|
|
74fbb52db4 | ||
|
|
36c96cc5ea | ||
|
|
e799ca32e9 | ||
|
|
56bf802af2 | ||
|
|
662560a609 | ||
|
|
27b8c600fa | ||
|
|
23fc78dd0c | ||
|
|
099f524203 | ||
|
|
172383e9d7 | ||
|
|
136bcdb71c | ||
|
|
82d1c43641 | ||
|
|
3b2d74e3fb | ||
|
|
4201d66f56 | ||
|
|
50749b312c | ||
|
|
d47dbd3661 | ||
|
|
2ccb01c60e | ||
|
|
4725052d5b | ||
|
|
a05c40b9c2 | ||
|
|
67b9d1eb33 | ||
|
|
927137594e | ||
|
|
a771bd7032 | ||
|
|
ce0e4a1978 | ||
|
|
0035da6462 | ||
|
|
dc43119cc7 | ||
|
|
6794db9110 | ||
|
|
6ba3b29eb2 | ||
|
|
28aa519025 | ||
|
|
113243ebd5 | ||
|
|
2c36e2e1ab | ||
|
|
fb688c3a45 | ||
|
|
3dfd48bf4a | ||
|
|
e4641b4d10 | ||
|
|
ac26666f48 | ||
|
|
080e232d16 | ||
|
|
3e985d8a88 | ||
|
|
29ecaa5fca | ||
|
|
dd899db7a4 | ||
|
|
672dfd2793 | ||
|
|
d1d725d7ad | ||
|
|
d48f0c9f10 | ||
|
|
90517e779f | ||
|
|
1e3d894b73 | ||
|
|
517d62a3e2 | ||
|
|
d77a61cf23 | ||
|
|
566c0d683f | ||
|
|
ea58f8a4ec | ||
|
|
cbc32838d9 | ||
|
|
ee067e97ef | ||
|
|
d2fc1febbe | ||
|
|
4c11ca1d67 | ||
|
|
fef741fb65 | ||
|
|
d929a916f3 | ||
|
|
f719356a32 | ||
|
|
771ab2f461 | ||
|
|
bcef104f02 | ||
|
|
2ac8f2fbe9 | ||
|
|
a1cc2047cc | ||
|
|
1f1934c30a | ||
|
|
922cae6ea0 | ||
|
|
fec5f82d4e | ||
|
|
2c05550bea | ||
|
|
ce4b9c31da | ||
|
|
753f8361cc | ||
|
|
5fec5b791a | ||
|
|
6add0c64a8 | ||
|
|
39172028c7 | ||
|
|
bfcc93360a | ||
|
|
9314a9f366 | ||
|
|
e2f34c682c | ||
|
|
cafca859ff | ||
|
|
b3629dae7d | ||
|
|
36969edf5b | ||
|
|
34e912788a | ||
|
|
7718939d3d | ||
|
|
d09bf3b2b9 | ||
|
|
2ecbb0094a | ||
|
|
b749f8cb43 | ||
|
|
2928ef650c | ||
|
|
cbb8cc3eef | ||
|
|
e401cff1d8 | ||
|
|
b4e82e2f3e | ||
|
|
d8cde59445 | ||
|
|
22eae3695d | ||
|
|
e58a9ee97d | ||
|
|
60f15be674 | ||
|
|
ec5d2ea311 | ||
|
|
9d99ed9f08 | ||
|
|
aa95348f88 | ||
|
|
21e5905346 | ||
|
|
81d5dc8648 | ||
|
|
0e81a737fe | ||
|
|
ba87c4319a | ||
|
|
ec57e2a134 | ||
|
|
dc325fd6e4 | ||
|
|
77457ea287 | ||
|
|
e8b5b63d1c | ||
|
|
66275b1859 | ||
|
|
73d32ca516 | ||
|
|
540c2f28b1 | ||
|
|
6fc6977161 | ||
|
|
c2d396a37f | ||
|
|
b20416b7c5 | ||
|
|
be9949c74f | ||
|
|
91c4718897 | ||
|
|
b114c72af5 | ||
|
|
883a5bcccc | ||
|
|
36c0060397 | ||
|
|
da3b1211e6 | ||
|
|
c851c8ae7c | ||
|
|
3f49c16e37 | ||
|
|
b1829d3728 | ||
|
|
7d279b7d0f | ||
|
|
6c30d0dea4 | ||
| 2fb5ba6951 | |||
|
|
afee38ade6 | ||
|
|
619be2651b | ||
|
|
211d89990d | ||
|
|
7d414fc970 | ||
|
|
320f9bd6b6 | ||
|
|
3de73a337c | ||
|
|
2f9db8e1ba | ||
|
|
8772a23697 | ||
| 0c2562a6d1 | |||
|
|
be6595e799 | ||
| d269688e8e | |||
| c94a3bc059 | |||
|
|
a37a3a8ea6 | ||
|
|
48773914c3 |
64
.github/workflows/create-release-from-commit.yaml
vendored
Normal file
64
.github/workflows/create-release-from-commit.yaml
vendored
Normal file
@@ -0,0 +1,64 @@
|
||||
name: "Create Release Tag"
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
description: 'The new release tag to create (e.g., v3.8.1)'
|
||||
required: true
|
||||
type: string
|
||||
commit_sha:
|
||||
description: 'The short commit SHA from the calcom submodule to use for this release'
|
||||
required: true
|
||||
type: string
|
||||
|
||||
jobs:
|
||||
release:
|
||||
name: "Tag Release"
|
||||
runs-on: "ubuntu-latest"
|
||||
|
||||
steps:
|
||||
- name: "Checkout main branch to get starting point"
|
||||
uses: "actions/checkout@v4"
|
||||
with:
|
||||
token: ${{ secrets.TOKEN_GITEA }}
|
||||
# We check out main, but will create the release commit off of it
|
||||
# without modifying the branch itself.
|
||||
ref: 'main'
|
||||
submodules: true
|
||||
|
||||
- name: "Create Release Commit and Tag"
|
||||
run: |
|
||||
# Configure git user for the commit
|
||||
git config user.email "actions@gitea.local"
|
||||
git config user.name "Gitea Actions"
|
||||
|
||||
echo "Updating submodule to commit ${{ inputs.commit_sha }}..."
|
||||
|
||||
# Navigate into the submodule, fetch latest history, and check out the specific commit.
|
||||
# This modifies the submodule's checked-out version in the working directory.
|
||||
cd calcom
|
||||
git fetch origin
|
||||
git checkout ${{ inputs.commit_sha }}
|
||||
cd ..
|
||||
|
||||
# Stage the change to the submodule pointer.
|
||||
git add calcom
|
||||
|
||||
# Create a NEW commit. This commit is NOT on the main branch.
|
||||
# It's a "dangling" commit that only HEAD is pointing to at this moment.
|
||||
# The parent of this new commit is the latest commit from 'main'.
|
||||
git commit -m "release: Version ${{ inputs.version }} with calcom at ${{ inputs.commit_sha }}"
|
||||
|
||||
# Get the full SHA of the new commit we just created.
|
||||
NEW_COMMIT_SHA=$(git rev-parse HEAD)
|
||||
echo "Created new release commit: $NEW_COMMIT_SHA"
|
||||
|
||||
echo "Creating and pushing tag ${{ inputs.version }}..."
|
||||
|
||||
# Create an annotated tag pointing directly at our new, branchless commit.
|
||||
git tag -a "${{ inputs.version }}" -m "Release ${{ inputs.version }}" $NEW_COMMIT_SHA
|
||||
|
||||
# Push ONLY the new tag to the repository. Git will automatically send
|
||||
# the required commit object ($NEW_COMMIT_SHA) along with the tag.
|
||||
git push origin "${{ inputs.version }}"
|
||||
93
.github/workflows/create-release.yaml
vendored
93
.github/workflows/create-release.yaml
vendored
@@ -1,60 +1,77 @@
|
||||
name: "Create Release"
|
||||
name: "Create Gitea Release"
|
||||
|
||||
on: # yamllint disable-line rule:truthy
|
||||
# This workflow is triggered manually from the Gitea Actions UI
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
RELEASE_TAG:
|
||||
description: 'v{Major}.{Minor}.{Patch}'
|
||||
description: 'The release tag to create, formatted as v{Major}.{Minor}.{Patch}'
|
||||
required: true
|
||||
|
||||
jobs:
|
||||
release:
|
||||
name: "Release"
|
||||
permissions:
|
||||
contents: write
|
||||
runs-on: "ubuntu-latest"
|
||||
|
||||
steps:
|
||||
|
||||
# Step 1: Check out the repository source code and its submodules.
|
||||
# The TOKEN_GITEA is used here to grant permission for the later 'git push'.
|
||||
- name: Checkout source
|
||||
uses: actions/checkout@v3
|
||||
uses: "actions/checkout@v4"
|
||||
with:
|
||||
token: ${{ secrets.ACTIONS_ACCESS_TOKEN }}
|
||||
token: ${{ secrets.TOKEN_GITEA }}
|
||||
submodules: true
|
||||
|
||||
- name: Create branch and tag submodule
|
||||
# Step 2: Create a new release branch, update the submodule to the specified tag,
|
||||
# and push the new branch to the Gitea repository.
|
||||
- name: Create Branch and Update Submodule
|
||||
run: |
|
||||
git config user.email "actions@github.com"
|
||||
git config user.name "actions-user"
|
||||
git submodule update --init --remote
|
||||
# Configure git user for the commit
|
||||
git config user.email "actions@gitea.local"
|
||||
git config user.name "Gitea Actions"
|
||||
|
||||
# Create the new release branch
|
||||
git checkout -b 'release-${{ inputs.RELEASE_TAG }}'
|
||||
|
||||
# Enter the submodule directory, fetch the latest tags, and check out the correct one.
|
||||
# This points the submodule to the specific commit associated with the release tag.
|
||||
(cd calcom && git fetch --tags origin && git checkout 'refs/tags/${{ inputs.RELEASE_TAG }}')
|
||||
|
||||
# Stage and commit the change to the submodule pointer
|
||||
git add calcom
|
||||
git commit -m "tag version Cal.com version ${{ inputs.RELEASE_TAG }}"
|
||||
git commit -m "Update submodule to Cal.com version ${{ inputs.RELEASE_TAG }}"
|
||||
|
||||
# Push the newly created release branch to the remote Gitea repository
|
||||
git push origin 'release-${{ inputs.RELEASE_TAG }}'
|
||||
|
||||
# note: instead of secrets.GITHUB_TOKEN here, we need to use a PAT
|
||||
# so that the release creation triggers the image build workflow
|
||||
- name: "Create release"
|
||||
uses: "actions/github-script@v6"
|
||||
with:
|
||||
github-token: "${{ secrets.ACTIONS_ACCESS_TOKEN }}"
|
||||
script: |
|
||||
const isPreRelease = '${{ inputs.RELEASE_TAG }}'.includes('-rc');
|
||||
try {
|
||||
const response = await github.rest.repos.createRelease({
|
||||
draft: false,
|
||||
generate_release_notes: true,
|
||||
body: 'For Cal.com release details, see: https://github.com/calcom/cal.com/releases/tag/${{ inputs.RELEASE_TAG }}',
|
||||
name: '${{ inputs.RELEASE_TAG }}',
|
||||
target_commitish: 'release-${{ inputs.RELEASE_TAG }}',
|
||||
owner: context.repo.owner,
|
||||
prerelease: isPreRelease,
|
||||
repo: context.repo.repo,
|
||||
tag_name: '${{ inputs.RELEASE_TAG }}',
|
||||
});
|
||||
# Step 3: Call the Gitea API to create the official release object.
|
||||
# This uses the same API token to authorize the action.
|
||||
- name: "Create Gitea Release"
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.TOKEN_GITEA }}
|
||||
GITEA_API_URL: https://git.nethery.dev/api/v1
|
||||
OWNER: ${{ gitea.repository_owner }}
|
||||
REPO: ${{ gitea.repository_name }}
|
||||
run: |
|
||||
# Determine if the tag indicates a pre-release
|
||||
is_prerelease=false
|
||||
if [[ "${{ inputs.RELEASE_TAG }}" == *"-rc"* || "${{ inputs.RELEASE_TAG }}" == *"-beta"* ]]; then
|
||||
is_prerelease=true
|
||||
fi
|
||||
|
||||
core.exportVariable('RELEASE_ID', response.data.id);
|
||||
core.exportVariable('RELEASE_UPLOAD_URL', response.data.upload_url);
|
||||
} catch (error) {
|
||||
core.setFailed(error.message);
|
||||
}
|
||||
echo "Creating release ${{ inputs.RELEASE_TAG }}..."
|
||||
echo "Is prerelease: $is_prerelease"
|
||||
|
||||
# Use curl to send a POST request to the Gitea API's 'create release' endpoint
|
||||
curl --fail --silent --show-error -L -X POST \
|
||||
-H "accept: application/json" \
|
||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
"${GITEA_API_URL}/repos/${OWNER}/${REPO}/releases" \
|
||||
-d '{
|
||||
"tag_name": "${{ inputs.RELEASE_TAG }}",
|
||||
"target_commitish": "release-${{ inputs.RELEASE_TAG }}",
|
||||
"name": "${{ inputs.RELEASE_TAG }}",
|
||||
"body": "For Cal.com release details, see: https://github.com/calcom/cal.com/releases/tag/${{ inputs.RELEASE_TAG }}",
|
||||
"prerelease": '${is_prerelease}'
|
||||
}'
|
||||
@@ -61,15 +61,11 @@ jobs:
|
||||
run: |
|
||||
git submodule update --init
|
||||
|
||||
# - name: Log in to the Docker Hub registry
|
||||
# uses: docker/login-action@v3
|
||||
# with:
|
||||
# # Username used to log against the Docker registry
|
||||
# username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
||||
# # Password or personal access token used to log against the Docker registry
|
||||
# password: ${{ secrets.DOCKER_HUB_TOKEN }}
|
||||
# # Log out from the Docker registry at the end of a job
|
||||
# logout: true # optional, default is true
|
||||
- name: Log in to the Docker Hub registry
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKER_HUB_TOKEN }}
|
||||
|
||||
- name: Log in to the Github Container registry
|
||||
uses: docker/login-action@v3
|
||||
@@ -84,7 +80,7 @@ jobs:
|
||||
with:
|
||||
images: |
|
||||
ghcr.io/nnethery/cal.com
|
||||
# Add flavor latest only on full releases, not on pre-releases
|
||||
nnethery/cal.com
|
||||
flavor: |
|
||||
latest=${{ !github.event.release.prerelease }}
|
||||
|
||||
|
||||
2
calcom
2
calcom
Submodule calcom updated: e781a78eea...68b93385eb
Reference in New Issue
Block a user