Skip to content

ci: removed standard-version config in package.json #2098

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.

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

Draft
wants to merge 64 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
ecc7c3b
ci: removed standard-version config in package.json
Ani1357 Apr 27, 2025
1d8b7ed
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Apr 28, 2025
1e1d5a4
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Apr 28, 2025
8eb81ff
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Apr 28, 2025
3bff040
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Apr 28, 2025
e7a8221
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Apr 28, 2025
3ec54f3
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Apr 29, 2025
fd29dc0
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Apr 29, 2025
188201b
ci: new rc pipeline
Ani1357 Apr 29, 2025
bd7ca38
ci: added dry run support
Ani1357 Apr 29, 2025
3763901
chore: empty commit
Ani1357 Apr 29, 2025
2f582dc
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Apr 29, 2025
006b6c9
fix: reverted typo
Ani1357 Apr 30, 2025
fdba726
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Apr 30, 2025
57425e0
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Apr 30, 2025
ea4a66f
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Apr 30, 2025
ca02aea
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot May 1, 2025
901323b
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot May 1, 2025
164f47d
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot May 1, 2025
f88c78f
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot May 6, 2025
905273e
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot May 6, 2025
427242d
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot May 6, 2025
c45e05d
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot May 7, 2025
ced5890
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot May 8, 2025
0554c35
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot May 8, 2025
e411ce1
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot May 9, 2025
44d28e0
Merge branch 'main' into APL-730
Ani1357 May 23, 2025
9b25121
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot May 26, 2025
92fa617
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot May 26, 2025
eb19e30
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot May 27, 2025
09d5337
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot May 30, 2025
0596dc6
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot May 30, 2025
44ddce0
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 2, 2025
a3e307a
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 2, 2025
7b2193b
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 2, 2025
deb3e38
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 3, 2025
54b0b44
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 5, 2025
2c68a61
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 5, 2025
e392958
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 5, 2025
d8c8c6e
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 6, 2025
d436bfb
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 6, 2025
020abf3
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 10, 2025
ca6f2d3
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 10, 2025
480f6df
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 10, 2025
adfab70
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 11, 2025
81c4ea4
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 11, 2025
05be8e2
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 11, 2025
41b114c
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 12, 2025
333c24b
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 12, 2025
c0494e5
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 12, 2025
1639eb7
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 12, 2025
b94821e
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 13, 2025
64a75af
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 13, 2025
3c95771
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 16, 2025
0ea08ab
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 16, 2025
a8f2a81
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 17, 2025
3093109
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 17, 2025
f29a333
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 18, 2025
5e93436
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 18, 2025
c20a289
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 18, 2025
10b415c
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 19, 2025
2e1362a
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 19, 2025
519d842
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 19, 2025
34ae740
Merge remote-tracking branch 'origin/main' into APL-730
svcAPLBot Jun 20, 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
76 changes: 56 additions & 20 deletions .github/workflows/create_rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,16 @@ on:
- true
- false

env:
CACHE_REGISTRY: ghcr.io
CACHE_REPO: linode/apl-core
REPO: linode/apl-core
DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_LINODEBOT_TOKEN }}
DOCKER_USERNAME: ${{ vars.DOCKERHUB_LINODEBOT_USERNAME }}
DEV_KUBECONFIG_64: ${{ secrets.DEV_KUBECONFIG }}
BOT_EMAIL: ${{ vars.BOT_EMAIL }}
BOT_USERNAME: ${{ vars.BOT_USERNAME }}

jobs:
create_patch_release:
runs-on: ubuntu-22.04
Expand All @@ -27,24 +37,16 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Determine commit from where to create the RC
id: determine_commit
run: |
if [ -n "${{ github.event.inputs.rc_commit_sha }}" ]; then
commit_sha="${{ github.event.inputs.rc_commit_sha }}"
echo "Using provided commit sha: $commit_sha"
echo "commit_sha=$commit_sha" >> $GITHUB_ENV
else
commit_sha=$(git rev-parse HEAD)
echo "No commit sha provided, using the latest commit on main: $commit_sha"
echo "commit_sha=$commit_sha" >> $GITHUB_ENV
fi
# Checkout inputs.rc_commit_sha or main if not provided
ref: ${{ github.event.inputs.rc_commit_sha || 'main' }}

- uses: actions/setup-node@v4
with:
node-version: '20'

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Install dependencies
run: |
npm install standard-version
Expand All @@ -53,17 +55,51 @@ jobs:
id: create_release
env:
DRY_RUN: ${{ github.event.inputs.dry_run }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COMMIT_SHA: ${{ env.commit_sha }}
BOT_EMAIL: ${{ vars.BOT_EMAIL }}
BOT_USERNAME: ${{ vars.BOT_USERNAME }}
GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
COMMIT_SHA: ${{ github.event.inputs.rc_commit_sha || 'main' }}
run: |
ci/scripts/create_rc.sh

- name: Set environment variables
run: |
TAG=v$( jq -r '.version' package.json)
echo "Creating TAG: $TAG"
echo "TAG=$TAG" >> $GITHUB_ENV
git config --global user.email $BOT_EMAIL
git config --global user.name $BOT_USERNAME

- name: Login to Github Packages
uses: docker/login-action@v3
with:
registry: ${{ env.CACHE_REGISTRY }}
username: ${{ env.BOT_USERNAME }}
password: '${{ secrets.BOT_TOKEN }}'

- name: CI tests, image build and push tag rc branch
if: ${{ github.event.inputs.dry_run == 'false' }}
uses: docker/build-push-action@v6
with:
push: true
context: .
tags: |
${{ env.CACHE_REGISTRY }}/${{ env.CACHE_REPO }}:${{ env.TAG }}

- name: Push to docker hub
if: ${{ github.event.inputs.dry_run == 'false' }}
id: push-to-docker
run: |
set -u
docker login ghcr.io -u $BOT_USERNAME -p ${{ secrets.BOT_TOKEN }}
image="$CACHE_REGISTRY/$CACHE_REPO:${{ env.TAG }}"
docker pull $image
docker tag $image $REPO:${{ env.TAG }}
docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
docker push $REPO:${{ env.TAG }}

# - name: Deploy to staging // TODO: support staging env
# run: ci/scripts/trigger_dev.sh

- name: Prepare chart
env:
BOT_EMAIL: ${{ vars.BOT_EMAIL }}
BOT_USERNAME: ${{ vars.BOT_USERNAME }}
id: prepare_chart
run: |
ci/scripts/prepare_chart_for_release.sh
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
push:
branches:
- '**'
- '!rc/**'
tags-ignore:
- '*'
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/patch_rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
git -P log --pretty=format:"%s" "${LATEST_TAG}..HEAD"
COMMITS=$(git log --pretty=format:"%s" "${LATEST_TAG}..HEAD")

if [[ $COMMITS == *"feat:"* || $COMMITS == *"fix:"* ]]; then
if [[ $COMMITS == *"feat:"* || $COMMITS == *"fix:"* || $COMMITS == *"chore(versions):"*]]; then
echo "RC_RELEASE=true" >> $GITHUB_ENV
else
echo "No feat/fix commits found. Skipping release."
Expand Down
5 changes: 0 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,6 @@
"bootstrap-dev-with-repo": "CI=1 ENV_DIR=/tmp/otomi-bootstrap-dev binzx/otomi bootstrap",
"bootstrap-tests-fixtures": "CI=1 ENV_DIR=$PWD/tests/fixtures binzx/otomi bootstrap"
},
"standard-version": {
Copy link
Contributor

Choose a reason for hiding this comment

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

Please double check with Create and push git tag task. In particular how changing this config impacts the following statement:

git tag -am "$COMMIT_MSG" $release_tag && git push --follow-tags

"skip": {
"tag": true
}
},
"type": "commonjs",
"version": "4.6.0"
}
Loading