Skip to content

Commit

Permalink
Merge pull request #16 from katalon-studio/Rebase-with-jenkinsci-master
Browse files Browse the repository at this point in the history
Rebase with jenkinsci master
  • Loading branch information
nghiadhd-2702 authored Apr 5, 2024
2 parents 4a36a69 + 567c712 commit 9c64417
Show file tree
Hide file tree
Showing 10 changed files with 105 additions and 369 deletions.
19 changes: 19 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name-template: 'v$NEXT_PATCH_VERSION'
# tag-template: 'v$NEXT_PATCH_VERSION'
categories:
- title: '🚀 Features'
labels:
- 'feature'
- 'enhancement'
- title: '🐛 Bug Fixes'
labels:
- 'fix'
- 'bugfix'
- 'bug'
- title: '🧰 Maintenance'
label: 'chore'
change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
template: |
## Changes
$CHANGES
73 changes: 73 additions & 0 deletions .github/workflows/cd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
# Note: additional setup is required, see https://www.jenkins.io/redirect/continuous-delivery-of-plugins

name: cd
on:
push:
branches: master

jobs:
validate:
runs-on: ubuntu-latest
outputs:
should_release: ${{ steps.verify-ci-status.outputs.result == 'success' && steps.interesting-categories.outputs.interesting == 'true' }}
steps:
- name: Check out
uses: actions/[email protected]
with:
fetch-depth: 0

- name: Verify CI status
uses: jenkins-infra/[email protected]
id: verify-ci-status
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
output_result: true

- name: Get Project Version from pom.xml
uses: entimaniac/[email protected]
id: getVersion

- name: Release Drafter
uses: release-drafter/release-drafter@v5
# if: steps.verify-ci-status.outputs.result == 'success'
with:
name: next
tag: ${{ steps.getVersion.outputs.version }}
version: ${{ steps.getVersion.outputs.version }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Check interesting categories
uses: jenkins-infra/[email protected]
id: interesting-categories
# if: steps.verify-ci-status.outputs.result == 'success'
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

release:
runs-on: ubuntu-latest
needs: [validate]
# if: needs.validate.outputs.should_release == 'true'
steps:
- name: Check out
uses: actions/[email protected]
with:
fetch-depth: 0
- name: Set up JDK 8
uses: actions/[email protected]
with:
distribution: temurin
java-version: 8
- name: Check Secrets
env:
DEBUG_USERNAME: ${{ secrets.MAVEN_USERNAME }}
DEBUG_TOKEN: ${{ secrets.MAVEN_TOKEN }}
run: |
echo $DEBUG_USERNAME
echo $DEBUG_TOKEN
- name: Release
uses: jenkins-infra/[email protected]
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,9 @@
*.iml
work
target
config
config
bin
.settings
.project
.classpath
.factorypath
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "automatic"
}
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018 Katalon Studio
Copyright (c) 2018-2022 Katalon Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
11 changes: 3 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@

<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>katalon</artifactId>
<version>1.0.36</version>
<version>1.0.37</version>
<packaging>hpi</packaging>
<name>Katalon Plugin</name>
<url>https://github.com/jenkinsci/katalon-plugin</url>
<url>https://github.com/katalon-studio/katalon-studio-jenkins-plugin</url>

<properties>
<!-- Baseline Jenkins version you use to build the plugin. Users must have this version or newer to run. -->
Expand Down Expand Up @@ -45,19 +45,14 @@
</organization>

<developers>
<developer>
<id>devalex88</id>
<name>Alex</name>
<email>[email protected]</email>
</developer>
</developers>

<scm>
<connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
<developerConnection>scm:git:[email protected]:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
<tag>HEAD</tag>
</scm>
</scm>

<repositories>
<repository>
Expand Down
207 changes: 0 additions & 207 deletions src/main/java/com/katalon/jenkins/plugin/KatalonUtils.java

This file was deleted.

Loading

0 comments on commit 9c64417

Please sign in to comment.