Skip to content

Commit

Permalink
Merge pull request #1239 from hyperskill/release/1.80
Browse files Browse the repository at this point in the history
Release 1.80
  • Loading branch information
ivan-magda authored Feb 18, 2025
2 parents fcbb0d7 + 31732c3 commit 0b462e2
Show file tree
Hide file tree
Showing 42 changed files with 322 additions and 321 deletions.
10 changes: 5 additions & 5 deletions .github/actions/setup-android/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,21 +62,21 @@ runs:

- name: Setup Ruby
if: ${{ inputs.setup-ruby == 'true' }}
uses: ruby/setup-ruby@v1.190.0
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3.0'
bundler-cache: true
working-directory: './androidHyperskillApp'

- name: Setup Java JDK
uses: actions/setup-java@v4.2.2
uses: actions/setup-java@v4
with:
java-version: '19'
distribution: 'temurin'

# Cache Gradle dependencies
- name: Setup Gradle Dependencies Cache
uses: actions/cache@v4.1.2
uses: actions/cache@v4
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
Expand All @@ -85,7 +85,7 @@ runs:
# Cache Gradle Wrapper
- name: Setup Gradle Wrapper Cache
uses: actions/cache@v4.1.2
uses: actions/cache@v4
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle*properties') }}
Expand All @@ -94,7 +94,7 @@ runs:
# Cache Kotlin/Native compiler
- name: Setup Kotlin/Native Compiler Cache
uses: actions/cache@v4.1.2
uses: actions/cache@v4
with:
path: ~/.konan
key: ${{ runner.os }}-kotlin-native-compiler-${{ hashFiles('gradle/libs.versions.toml') }}
Expand Down
16 changes: 8 additions & 8 deletions .github/actions/setup-ios/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ runs:
using: "composite"
steps:
- name: Setup Xcode version
uses: maxim-lobanov/setup-xcode@v1.6.0
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '15.4'

Expand Down Expand Up @@ -49,21 +49,21 @@ runs:
shell: bash

- name: Setup Ruby
uses: ruby/setup-ruby@v1.190.0
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3.0'
bundler-cache: true
working-directory: './iosHyperskillApp'

- name: Setup Java JDK
uses: actions/setup-java@v4.2.2
uses: actions/setup-java@v4
with:
java-version: '19'
distribution: 'temurin'

# Cache Gradle dependencies
- name: Setup Gradle Dependencies Cache
uses: actions/cache@v4.1.2
uses: actions/cache@v4
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
Expand All @@ -72,7 +72,7 @@ runs:
# Cache Gradle Wrapper
- name: Setup Gradle Wrapper Cache
uses: actions/cache@v4.1.2
uses: actions/cache@v4
with:
path: ~/.gradle/wrapper
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle*properties') }}
Expand All @@ -81,7 +81,7 @@ runs:
# Cache Kotlin/Native compiler
- name: Setup Kotlin/Native Compiler Cache
uses: actions/cache@v4.1.2
uses: actions/cache@v4
with:
path: ~/.konan
key: ${{ runner.os }}-kotlin-native-compiler-${{ hashFiles('gradle/libs.versions.toml') }}
Expand All @@ -100,7 +100,7 @@ runs:

# Cache Pods dependencies
- name: Cache Pods
uses: actions/cache@v4.1.2
uses: actions/cache@v4
id: cache-pods
with:
path: './iosHyperskillApp/Pods'
Expand All @@ -111,7 +111,7 @@ runs:
# Cache CocoaPods
- name: Cache CocoaPods
if: steps.cache-pods.outputs.cache-hit != 'true'
uses: actions/cache@v4.1.2
uses: actions/cache@v4
with:
path: |
~/.cocoapods
Expand Down
50 changes: 25 additions & 25 deletions .github/workflows/android_release_deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Gradle Wrapper Validation
uses: gradle/actions/wrapper-validation@v4

Expand All @@ -38,29 +38,29 @@ jobs:
timeout-minutes: 60

steps:
- name: Checkout
uses: actions/checkout@v4
- name: Checkout
uses: actions/checkout@v4

- name: Setup CI
id: setup
uses: ./.github/actions/setup-android
with:
setup-ruby: true
git-crypt-key: ${{ secrets.GIT_CRYPT_KEY }}
release-keystore-content: ${{ secrets.HYPERSKILL_RELEASE_KEYSTORE_CONTENT }}
service-account-content: ${{ secrets.SERVICE_ACCOUNT_CONTENT }}
- name: Setup CI
id: setup
uses: ./.github/actions/setup-android
with:
setup-ruby: true
git-crypt-key: ${{ secrets.GIT_CRYPT_KEY }}
release-keystore-content: ${{ secrets.HYPERSKILL_RELEASE_KEYSTORE_CONTENT }}
service-account-content: ${{ secrets.SERVICE_ACCOUNT_CONTENT }}

- name: Submit a new Release Build to the Google Play
working-directory: './androidHyperskillApp'
run: |
bundle exec fastlane release \
json_key:"${{ steps.setup.outputs.service-account-path }}" \
track:"alpha"
env:
IS_GIT_CRYPT_UNLOCKED: ${{ steps.setup.outputs.is-git-crypt-unlocked }}
HYPERSKILL_KEYSTORE_PATH: ${{ steps.setup.outputs.release-keystore-path }}
HYPERSKILL_RELEASE_STORE_PASSWORD: ${{ secrets.HYPERSKILL_RELEASE_STORE_PASSWORD }}
HYPERSKILL_RELEASE_KEY_ALIAS: ${{ secrets.HYPERSKILL_RELEASE_KEY_ALIAS }}
HYPERSKILL_RELEASE_KEY_PASSWORD: ${{ secrets.HYPERSKILL_RELEASE_KEY_PASSWORD }}
GITHUB_USER: ${{ github.actor }}
GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Submit a new Release Build to the Google Play
working-directory: "./androidHyperskillApp"
run: |
bundle exec fastlane release \
json_key:"${{ steps.setup.outputs.service-account-path }}" \
track:"alpha"
env:
IS_GIT_CRYPT_UNLOCKED: ${{ steps.setup.outputs.is-git-crypt-unlocked }}
HYPERSKILL_KEYSTORE_PATH: ${{ steps.setup.outputs.release-keystore-path }}
HYPERSKILL_RELEASE_STORE_PASSWORD: ${{ secrets.HYPERSKILL_RELEASE_STORE_PASSWORD }}
HYPERSKILL_RELEASE_KEY_ALIAS: ${{ secrets.HYPERSKILL_RELEASE_KEY_ALIAS }}
HYPERSKILL_RELEASE_KEY_PASSWORD: ${{ secrets.HYPERSKILL_RELEASE_KEY_PASSWORD }}
GITHUB_USER: ${{ github.actor }}
GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/auto_author_assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ jobs:
steps:
- uses: toshimaru/[email protected]
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
repo-token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/automerge_into_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
token: ${{ secrets.GH_PAT }}

- name: Setup Ruby
uses: ruby/setup-ruby@v1.190.0
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.3.0"
bundler-cache: true
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/build_caches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build Caches
on:
push:
branches:
- 'develop'
- "develop"
workflow_dispatch:
# Runs at 00:00 UTC every sunday
schedule:
Expand Down Expand Up @@ -32,19 +32,19 @@ jobs:
timeout-minutes: 60

steps:
- name: Checkout
uses: actions/checkout@v4
- name: Checkout
uses: actions/checkout@v4

- name: Setup CI
uses: ./.github/actions/setup-android
with:
setup-ruby: true
- name: Setup CI
uses: ./.github/actions/setup-android
with:
setup-ruby: true

- name: Clean
run: ./gradlew clean
env:
GITHUB_USER: ${{ github.actor }}
GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Clean
run: ./gradlew clean
env:
GITHUB_USER: ${{ github.actor }}
GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build-ios:
needs: files-changed
Expand All @@ -67,4 +67,4 @@ jobs:
run: ./gradlew clean
env:
GITHUB_USER: ${{ github.actor }}
GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,14 @@ jobs:
uses: actions/checkout@v4

- name: Setup Ruby
uses: ruby/setup-ruby@v1.190.0
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.3.0"
bundler-cache: true
working-directory: "./iosHyperskillApp"

- name: Cache Pods
uses: actions/cache@v4.1.2
uses: actions/cache@v4
id: cache-pods
with:
path: "./iosHyperskillApp/Pods"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cleanup_pr_caches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ jobs:
done
echo "Done"
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
72 changes: 36 additions & 36 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,41 +23,41 @@ jobs:
strategy:
fail-fast: false
matrix:
language: ['java-kotlin', 'javascript-typescript', 'ruby']
language: ["java-kotlin", "javascript-typescript", "ruby"]

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
queries: security-extended,security-and-quality
config: |
paths-ignore:
- iosHyperskillApp/iosHyperskillApp/MathJax.js
- iosHyperskillApp/iosHyperskillApp/highlight.js
- androidHyperskillApp/src/main/assets/scripts/highlight.pack.js
- androidHyperskillApp/build/**/*
- .gradle/**/*
- if: matrix.language == 'java-kotlin'
name: Setup Kotlin
id: setup-kotlin
uses: ./.github/actions/setup-android
with:
git-crypt-key: ${{ secrets.GIT_CRYPT_KEY }}

- if: matrix.language == 'java-kotlin'
name: Build Kotlin
run: ./gradlew assembleDebug
env:
IS_GIT_CRYPT_UNLOCKED: ${{ steps.setup-kotlin.outputs.is-git-crypt-unlocked }}
GITHUB_USER: ${{ github.actor }}
GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
- name: Checkout
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
queries: security-extended,security-and-quality
config: |
paths-ignore:
- iosHyperskillApp/iosHyperskillApp/MathJax.js
- iosHyperskillApp/iosHyperskillApp/highlight.js
- androidHyperskillApp/src/main/assets/scripts/highlight.pack.js
- androidHyperskillApp/build/**/*
- .gradle/**/*
- if: matrix.language == 'java-kotlin'
name: Setup Kotlin
id: setup-kotlin
uses: ./.github/actions/setup-android
with:
git-crypt-key: ${{ secrets.GIT_CRYPT_KEY }}

- if: matrix.language == 'java-kotlin'
name: Build Kotlin
run: ./gradlew assembleDebug
env:
IS_GIT_CRYPT_UNLOCKED: ${{ steps.setup-kotlin.outputs.is-git-crypt-unlocked }}
GITHUB_USER: ${{ github.actor }}
GITHUB_PERSONAL_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
Loading

0 comments on commit 0b462e2

Please sign in to comment.