Skip to content

Commit 662e9d5

Browse files
committed
fix until-build and set-build attributes of idea-version in plugin.xml
1 parent d70bd63 commit 662e9d5

File tree

2 files changed

+21
-13
lines changed

2 files changed

+21
-13
lines changed

.github/workflows/verify.yml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ jobs:
5353
IDE_VERSIONS="$(echo "$PROPERTIES" | grep "^pluginVerifierIdeVersions:" | md5sum)"
5454
echo "::set-output name=ideVersions::$IDE_VERSIONS"
5555
echo "::set-output name=pluginVerifierHomeDir::~/.pluginVerifier"
56+
touch results-${GITHUB_SHA}.txt
57+
echo "output file results-${GITHUB_SHA}.txt"
5658
5759
- name: Setup Plugin Verifier IDEs Cache
5860
uses: actions/cache@v2.1.6
@@ -63,27 +65,28 @@ jobs:
6365
- name: Gradle check
6466
run: |
6567
cmd="./gradlew check --console=plain"
66-
echo $cmd >> ~/.${{ env.GITHUB_SHA }}.txt
67-
eval $cmd | tee -a ~/.${{ env.GITHUB_SHA }}.txt
68-
echo '============================================' >> ~/.${{ env.GITHUB_SHA }}.txt
69-
echo >> ~/.${{ env.GITHUB_SHA }}.txt
68+
echo $cmd >> results-${GITHUB_SHA}.txt
69+
eval $cmd | tee -a results-${GITHUB_SHA}.txt
70+
echo '============================================' >> results-${GITHUB_SHA}.txt
71+
echo >> results-${GITHUB_SHA}.txt
7072
7173
- name: Verify Plugin
7274
run: |
7375
cmd="./gradlew verifyPlugin --console=plain"
74-
echo $cmd >> ~/.${{ env.GITHUB_SHA }}.txt
75-
eval $cmd | tee -a ~/.${{ env.GITHUB_SHA }}.txt
76-
echo '============================================' >> ~/.${{ env.GITHUB_SHA }}.txt
77-
echo >> ~/.${{ env.GITHUB_SHA }}.txt
76+
echo $cmd >> results-${GITHUB_SHA}.txt
77+
eval $cmd | tee -a results-${GITHUB_SHA}.txt
78+
echo '============================================' >> results-${GITHUB_SHA}.txt
79+
echo >> results-${GITHUB_SHA}.txt
7880
7981
- name: Verify IntelliJ Compatibility
8082
id: verify
8183
run: |
8284
cmd="./gradlew runPluginVerifier --console=plain -Pplugin.verifier.home.dir=${{ steps.properties.outputs.pluginVerifierHomeDir }}"
83-
echo $cmd >> ~/.${{ env.GITHUB_SHA }}.txt
84-
eval $cmd | tee -a ~/.${{ env.GITHUB_SHA }}.txt
85-
echo '============================================' >> ~/.${{ env.GITHUB_SHA }}.txt
86-
echo >> ~/.${{ env.GITHUB_SHA }}.txt
85+
echo $cmd >> results-${GITHUB_SHA}.txt
86+
eval $cmd | tee -a results-${GITHUB_SHA}.txt
87+
echo '============================================' >> results-${GITHUB_SHA}.txt
88+
echo >> results-${GITHUB_SHA}.txt
89+
echo "::set-output name=results-file-name::results-${GITHUB_SHA}.txt"
8790
8891
- name: Sync master branch verification results to gist
8992
id: sync
@@ -94,4 +97,4 @@ jobs:
9497
gist_url: https://gist.github.com/kagof/63edd71468e771dcde77ff87f251f8a3
9598
gist_title: IntelliJ Pokémon Progress Bar Verification Results
9699
gist_description: Latest intellij-pokemon-progress master branch test results ${{ github.run_number }} (${{ github.sha }})
97-
github_file: ~/.${{ env.GITHUB_SHA }}.txt
100+
github_file: ${{ steps.verify.outputs.results-file-name }}

build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import com.jetbrains.plugin.structure.intellij.version.IdeVersion
12
import org.jetbrains.intellij.tasks.RunPluginVerifierTask.FailureLevel
23

34
val name: String by project
@@ -76,6 +77,10 @@ tasks {
7677

7778
patchPluginXml {
7879
untilBuild.set(null as String?)
80+
sinceBuild.convention(project.provider {
81+
val ideVersion = IdeVersion.createIdeVersion(setupDependencies.get().idea.get().buildNumber)
82+
"${ideVersion.baselineVersion}.${ideVersion.build}"
83+
})
7984

8085
File(changenotesFile).let {
8186
if (it.exists() && it.isFile && it.canRead()) changeNotes.set(it.readText())

0 commit comments

Comments
 (0)