Skip to content

Commit 0b462e2

Browse files
ivan-magdaivan-magda
authored
Merge pull request #1239 from hyperskill/release/1.80
Release 1.80
2 parents fcbb0d7 + 31732c3 commit 0b462e2

42 files changed

Lines changed: 322 additions & 321 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/actions/setup-android/action.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,21 @@ runs:
6262

6363
- name: Setup Ruby
6464
if: ${{ inputs.setup-ruby == 'true' }}
65-
uses: ruby/setup-ruby@v1.190.0
65+
uses: ruby/setup-ruby@v1
6666
with:
6767
ruby-version: '3.3.0'
6868
bundler-cache: true
6969
working-directory: './androidHyperskillApp'
7070

7171
- name: Setup Java JDK
72-
uses: actions/setup-java@v4.2.2
72+
uses: actions/setup-java@v4
7373
with:
7474
java-version: '19'
7575
distribution: 'temurin'
7676

7777
# Cache Gradle dependencies
7878
- name: Setup Gradle Dependencies Cache
79-
uses: actions/cache@v4.1.2
79+
uses: actions/cache@v4
8080
with:
8181
path: ~/.gradle/caches
8282
key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
@@ -85,7 +85,7 @@ runs:
8585
8686
# Cache Gradle Wrapper
8787
- name: Setup Gradle Wrapper Cache
88-
uses: actions/cache@v4.1.2
88+
uses: actions/cache@v4
8989
with:
9090
path: ~/.gradle/wrapper
9191
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle*properties') }}
@@ -94,7 +94,7 @@ runs:
9494
9595
# Cache Kotlin/Native compiler
9696
- name: Setup Kotlin/Native Compiler Cache
97-
uses: actions/cache@v4.1.2
97+
uses: actions/cache@v4
9898
with:
9999
path: ~/.konan
100100
key: ${{ runner.os }}-kotlin-native-compiler-${{ hashFiles('gradle/libs.versions.toml') }}

‎.github/actions/setup-ios/action.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ runs:
1818
using: "composite"
1919
steps:
2020
- name: Setup Xcode version
21-
uses: maxim-lobanov/setup-xcode@v1.6.0
21+
uses: maxim-lobanov/setup-xcode@v1
2222
with:
2323
xcode-version: '15.4'
2424

@@ -49,21 +49,21 @@ runs:
4949
shell: bash
5050

5151
- name: Setup Ruby
52-
uses: ruby/setup-ruby@v1.190.0
52+
uses: ruby/setup-ruby@v1
5353
with:
5454
ruby-version: '3.3.0'
5555
bundler-cache: true
5656
working-directory: './iosHyperskillApp'
5757

5858
- name: Setup Java JDK
59-
uses: actions/setup-java@v4.2.2
59+
uses: actions/setup-java@v4
6060
with:
6161
java-version: '19'
6262
distribution: 'temurin'
6363

6464
# Cache Gradle dependencies
6565
- name: Setup Gradle Dependencies Cache
66-
uses: actions/cache@v4.1.2
66+
uses: actions/cache@v4
6767
with:
6868
path: ~/.gradle/caches
6969
key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
@@ -72,7 +72,7 @@ runs:
7272
7373
# Cache Gradle Wrapper
7474
- name: Setup Gradle Wrapper Cache
75-
uses: actions/cache@v4.1.2
75+
uses: actions/cache@v4
7676
with:
7777
path: ~/.gradle/wrapper
7878
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle*properties') }}
@@ -81,7 +81,7 @@ runs:
8181
8282
# Cache Kotlin/Native compiler
8383
- name: Setup Kotlin/Native Compiler Cache
84-
uses: actions/cache@v4.1.2
84+
uses: actions/cache@v4
8585
with:
8686
path: ~/.konan
8787
key: ${{ runner.os }}-kotlin-native-compiler-${{ hashFiles('gradle/libs.versions.toml') }}
@@ -100,7 +100,7 @@ runs:
100100

101101
# Cache Pods dependencies
102102
- name: Cache Pods
103-
uses: actions/cache@v4.1.2
103+
uses: actions/cache@v4
104104
id: cache-pods
105105
with:
106106
path: './iosHyperskillApp/Pods'
@@ -111,7 +111,7 @@ runs:
111111
# Cache CocoaPods
112112
- name: Cache CocoaPods
113113
if: steps.cache-pods.outputs.cache-hit != 'true'
114-
uses: actions/cache@v4.1.2
114+
uses: actions/cache@v4
115115
with:
116116
path: |
117117
~/.cocoapods

‎.github/workflows/android_release_deployment.yml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
steps:
2626
- name: Checkout
2727
uses: actions/checkout@v4
28-
28+
2929
- name: Gradle Wrapper Validation
3030
uses: gradle/actions/wrapper-validation@v4
3131

@@ -38,29 +38,29 @@ jobs:
3838
timeout-minutes: 60
3939

4040
steps:
41-
- name: Checkout
42-
uses: actions/checkout@v4
41+
- name: Checkout
42+
uses: actions/checkout@v4
4343

44-
- name: Setup CI
45-
id: setup
46-
uses: ./.github/actions/setup-android
47-
with:
48-
setup-ruby: true
49-
git-crypt-key: ${{ secrets.GIT_CRYPT_KEY }}
50-
release-keystore-content: ${{ secrets.HYPERSKILL_RELEASE_KEYSTORE_CONTENT }}
51-
service-account-content: ${{ secrets.SERVICE_ACCOUNT_CONTENT }}
44+
- name: Setup CI
45+
id: setup
46+
uses: ./.github/actions/setup-android
47+
with:
48+
setup-ruby: true
49+
git-crypt-key: ${{ secrets.GIT_CRYPT_KEY }}
50+
release-keystore-content: ${{ secrets.HYPERSKILL_RELEASE_KEYSTORE_CONTENT }}
51+
service-account-content: ${{ secrets.SERVICE_ACCOUNT_CONTENT }}
5252

53-
- name: Submit a new Release Build to the Google Play
54-
working-directory: './androidHyperskillApp'
55-
run: |
56-
bundle exec fastlane release \
57-
json_key:"${{ steps.setup.outputs.service-account-path }}" \
58-
track:"alpha"
59-
env:
60-
IS_GIT_CRYPT_UNLOCKED: ${{ steps.setup.outputs.is-git-crypt-unlocked }}
61-
HYPERSKILL_KEYSTORE_PATH: ${{ steps.setup.outputs.release-keystore-path }}
62-
HYPERSKILL_RELEASE_STORE_PASSWORD: ${{ secrets.HYPERSKILL_RELEASE_STORE_PASSWORD }}
63-
HYPERSKILL_RELEASE_KEY_ALIAS: ${{ secrets.HYPERSKILL_RELEASE_KEY_ALIAS }}
64-
HYPERSKILL_RELEASE_KEY_PASSWORD: ${{ secrets.HYPERSKILL_RELEASE_KEY_PASSWORD }}
65-
GITHUB_USER: ${{ github.actor }}
66-
GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
53+
- name: Submit a new Release Build to the Google Play
54+
working-directory: "./androidHyperskillApp"
55+
run: |
56+
bundle exec fastlane release \
57+
json_key:"${{ steps.setup.outputs.service-account-path }}" \
58+
track:"alpha"
59+
env:
60+
IS_GIT_CRYPT_UNLOCKED: ${{ steps.setup.outputs.is-git-crypt-unlocked }}
61+
HYPERSKILL_KEYSTORE_PATH: ${{ steps.setup.outputs.release-keystore-path }}
62+
HYPERSKILL_RELEASE_STORE_PASSWORD: ${{ secrets.HYPERSKILL_RELEASE_STORE_PASSWORD }}
63+
HYPERSKILL_RELEASE_KEY_ALIAS: ${{ secrets.HYPERSKILL_RELEASE_KEY_ALIAS }}
64+
HYPERSKILL_RELEASE_KEY_PASSWORD: ${{ secrets.HYPERSKILL_RELEASE_KEY_PASSWORD }}
65+
GITHUB_USER: ${{ github.actor }}
66+
GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/auto_author_assign.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ jobs:
1414
steps:
1515
- uses: toshimaru/auto-author-assign@v2.1.1
1616
with:
17-
repo-token: ${{ secrets.GITHUB_TOKEN }}
17+
repo-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/automerge_into_release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
token: ${{ secrets.GH_PAT }}
3838

3939
- name: Setup Ruby
40-
uses: ruby/setup-ruby@v1.190.0
40+
uses: ruby/setup-ruby@v1
4141
with:
4242
ruby-version: "3.3.0"
4343
bundler-cache: true

‎.github/workflows/build_caches.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build Caches
33
on:
44
push:
55
branches:
6-
- 'develop'
6+
- "develop"
77
workflow_dispatch:
88
# Runs at 00:00 UTC every sunday
99
schedule:
@@ -32,19 +32,19 @@ jobs:
3232
timeout-minutes: 60
3333

3434
steps:
35-
- name: Checkout
36-
uses: actions/checkout@v4
35+
- name: Checkout
36+
uses: actions/checkout@v4
3737

38-
- name: Setup CI
39-
uses: ./.github/actions/setup-android
40-
with:
41-
setup-ruby: true
38+
- name: Setup CI
39+
uses: ./.github/actions/setup-android
40+
with:
41+
setup-ruby: true
4242

43-
- name: Clean
44-
run: ./gradlew clean
45-
env:
46-
GITHUB_USER: ${{ github.actor }}
47-
GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
43+
- name: Clean
44+
run: ./gradlew clean
45+
env:
46+
GITHUB_USER: ${{ github.actor }}
47+
GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4848

4949
build-ios:
5050
needs: files-changed
@@ -67,4 +67,4 @@ jobs:
6767
run: ./gradlew clean
6868
env:
6969
GITHUB_USER: ${{ github.actor }}
70-
GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
70+
GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,14 @@ jobs:
118118
uses: actions/checkout@v4
119119

120120
- name: Setup Ruby
121-
uses: ruby/setup-ruby@v1.190.0
121+
uses: ruby/setup-ruby@v1
122122
with:
123123
ruby-version: "3.3.0"
124124
bundler-cache: true
125125
working-directory: "./iosHyperskillApp"
126126

127127
- name: Cache Pods
128-
uses: actions/cache@v4.1.2
128+
uses: actions/cache@v4
129129
id: cache-pods
130130
with:
131131
path: "./iosHyperskillApp/Pods"

‎.github/workflows/cleanup_pr_caches.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ jobs:
3333
done
3434
echo "Done"
3535
env:
36-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
36+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/codeql.yml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -23,41 +23,41 @@ jobs:
2323
strategy:
2424
fail-fast: false
2525
matrix:
26-
language: ['java-kotlin', 'javascript-typescript', 'ruby']
26+
language: ["java-kotlin", "javascript-typescript", "ruby"]
2727

2828
steps:
29-
- name: Checkout
30-
uses: actions/checkout@v4
31-
32-
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@v3
34-
with:
35-
languages: ${{ matrix.language }}
36-
queries: security-extended,security-and-quality
37-
config: |
38-
paths-ignore:
39-
- iosHyperskillApp/iosHyperskillApp/MathJax.js
40-
- iosHyperskillApp/iosHyperskillApp/highlight.js
41-
- androidHyperskillApp/src/main/assets/scripts/highlight.pack.js
42-
- androidHyperskillApp/build/**/*
43-
- .gradle/**/*
44-
45-
- if: matrix.language == 'java-kotlin'
46-
name: Setup Kotlin
47-
id: setup-kotlin
48-
uses: ./.github/actions/setup-android
49-
with:
50-
git-crypt-key: ${{ secrets.GIT_CRYPT_KEY }}
51-
52-
- if: matrix.language == 'java-kotlin'
53-
name: Build Kotlin
54-
run: ./gradlew assembleDebug
55-
env:
56-
IS_GIT_CRYPT_UNLOCKED: ${{ steps.setup-kotlin.outputs.is-git-crypt-unlocked }}
57-
GITHUB_USER: ${{ github.actor }}
58-
GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
59-
60-
- name: Perform CodeQL Analysis
61-
uses: github/codeql-action/analyze@v3
62-
with:
63-
category: "/language:${{matrix.language}}"
29+
- name: Checkout
30+
uses: actions/checkout@v4
31+
32+
- name: Initialize CodeQL
33+
uses: github/codeql-action/init@v3
34+
with:
35+
languages: ${{ matrix.language }}
36+
queries: security-extended,security-and-quality
37+
config: |
38+
paths-ignore:
39+
- iosHyperskillApp/iosHyperskillApp/MathJax.js
40+
- iosHyperskillApp/iosHyperskillApp/highlight.js
41+
- androidHyperskillApp/src/main/assets/scripts/highlight.pack.js
42+
- androidHyperskillApp/build/**/*
43+
- .gradle/**/*
44+
45+
- if: matrix.language == 'java-kotlin'
46+
name: Setup Kotlin
47+
id: setup-kotlin
48+
uses: ./.github/actions/setup-android
49+
with:
50+
git-crypt-key: ${{ secrets.GIT_CRYPT_KEY }}
51+
52+
- if: matrix.language == 'java-kotlin'
53+
name: Build Kotlin
54+
run: ./gradlew assembleDebug
55+
env:
56+
IS_GIT_CRYPT_UNLOCKED: ${{ steps.setup-kotlin.outputs.is-git-crypt-unlocked }}
57+
GITHUB_USER: ${{ github.actor }}
58+
GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
59+
60+
- name: Perform CodeQL Analysis
61+
uses: github/codeql-action/analyze@v3
62+
with:
63+
category: "/language:${{matrix.language}}"

0 commit comments

Comments
 (0)