AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-06-29 07:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into FS-222

Browse Source
This commit is contained in:
Ryan 2022-06-05 18:18:55 +01:00 committed by GitHub
commit 611ee619a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/codacy-analysis.yml vendored
View File

@ -21,7 +21,7 @@ jobs:
steps: steps:
# Checkout the repository to the GitHub Actions runner # Checkout the repository to the GitHub Actions runner
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v3
# Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
- name: Run Codacy Analysis CLI - name: Run Codacy Analysis CLI

4
.github/workflows/codeql-analysis.yml vendored
View File

@ -35,10 +35,10 @@ jobs:
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: Setup Java JDK - name: Setup Java JDK
uses: actions/setup-java@v2.3.0 uses: actions/setup-java@v3.3.0
with: with:
# The Java version to make available on the path. Takes a whole or semver Java version, or 1.x syntax (e.g. 1.8 => Java 8.x). Early access versions can be specified in the form of e.g. 14-ea, 14.0.0-ea, or 14.0.0-ea.28 # The Java version to make available on the path. Takes a whole or semver Java version, or 1.x syntax (e.g. 1.8 => Java 8.x). Early access versions can be specified in the form of e.g. 14-ea, 14.0.0-ea, or 14.0.0-ea.28
java-version: 17 java-version: 17

4
.github/workflows/downstream.yml vendored
View File

@ -18,7 +18,7 @@ jobs:
steps: steps:
# Step 1: run a standard checkout action, provided by github # Step 1: run a standard checkout action, provided by github
- name: Checkout main - name: Checkout main
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
ref: main ref: main
# submodules: 'recursive' ### may be needed in your situation # submodules: 'recursive' ### may be needed in your situation
@ -26,7 +26,7 @@ jobs:
# Step 2: run this sync action - specify the upstream repo, upstream branch to sync with, and target sync branch # Step 2: run this sync action - specify the upstream repo, upstream branch to sync with, and target sync branch
- name: Pull (Fast-Forward) upstream changes - name: Pull (Fast-Forward) upstream changes
id: sync id: sync
uses: aormsby/Fork-Sync-With-Upstream-action@v2.1 uses: aormsby/Fork-Sync-With-Upstream-action@v3.3
with: with:
upstream_repository: AtlasMediaGroup/TotalFreedomMod upstream_repository: AtlasMediaGroup/TotalFreedomMod
upstream_branch: main upstream_branch: main

4
.github/workflows/java17-maven.yml vendored
View File

@ -9,11 +9,11 @@ jobs:
steps: steps:
# Checkout the code # Checkout the code
- uses: actions/checkout@v1 - uses: actions/checkout@v3
# Java 16 Builds # Java 16 Builds
- name: Set up JDK 17 - name: Set up JDK 17
uses: actions/setup-java@v2.3.0 uses: actions/setup-java@v3.3.0
with: with:
java-version: 17 java-version: 17
distribution: 'adopt' distribution: 'adopt'