Skip to content

Wip/fix detect git push1by1 not found error 2 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tehraninasab wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Wip/fix detect git push1by1 not found error 2 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c67e5d
scripts/detectNotUsingGitPush1by1.fsx: fix
tehraninasab Apr 11, 2023
346828c
wip1
tehraninasab Apr 13, 2023
4c4b37f
wip2
tehraninasab Apr 13, 2023
5c936a5
wip3
tehraninasab Apr 13, 2023
7c8b442
wip4
tehraninasab Apr 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 0 additions & 135 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,99 +3,8 @@ name: CI
on: [push, pull_request]

jobs:
build:
name: Build
runs-on: ubuntu-22.04
container:
image: "ubuntu:22.04"
steps:
- uses: actions/checkout@v2
- name: Install required dependencies
run: |
apt update
apt install -y sudo
sudo apt install -y git
# workaround for https://github.com/actions/runner/issues/2033
- name: ownership workaround
run: git config --global --add safe.directory '*'
- name: Install dotnet sdk
run: sudo apt install -y dotnet6
- name: Compile the conventions solution
run: dotnet build --configuration Release conventions.sln
- name: Compile F# scripts
run: dotnet fsi scripts/compileFSharpScripts.fsx

file-conventions-tests:
name: Run FileConventions-lib unit tests
needs: build
runs-on: ubuntu-22.04
container:
image: "ubuntu:22.04"
steps:
- uses: actions/checkout@v2
- name: Install required dependencies
run: |
apt update
apt install --yes sudo

# We need to install curl otherwise we get these errors in the CI:
# Unable to load the service index for source https://api.nuget.org/v3/index.json.
# The SSL connection could not be established, see inner exception.
# The remote certificate is invalid because of errors in the certificate chain: UntrustedRoot
sudo apt install --yes curl

- name: Setup .NET
run: apt install -y dotnet6
- name: Run tests to validate F# scripts
run: dotnet test src/FileConventions.Test/FileConventions.Test.fsproj

commitlint-plugins-tests:
name: Run commitlint-related tests
needs: build
runs-on: ubuntu-22.04
container:
image: "ubuntu:22.04"
steps:
- uses: actions/checkout@v2
- name: Install required dependencies
run: |
apt update
apt install --yes sudo
sudo apt install --yes git

sudo apt install --yes curl
# can't install ubuntu's default nodejs version because we would get this error:
# error @jest/core@29.4.1: The engine "node" is incompatible with this module. Expected version "^14.15.0 || ^16.10.0 || >=18.0.0". Got "12.22.9"
curl --show-error --location https://deb.nodesource.com/setup_14.x | sudo --preserve-env bash -
sudo DEBIAN_FRONTEND=noninteractive apt install --yes nodejs
- name: Print versions
run: |
git --version
node --version
npm --version
npx commitlint --version
- name: Install yarn
run: |
npm install --global yarn
yarn add --dev jest typescript ts-jest @types/jest
- name: Install commitlint
run: |
npm install conventional-changelog-conventionalcommits
npm install commitlint@latest
- name: Print versions
run: |
git --version
node --version
npm --version
npx commitlint --version
- name: Run tests to validate our plugins
run: yarn jest

sanity-check:
name: Sanity check
needs:
- file-conventions-tests
- commitlint-plugins-tests
runs-on: ubuntu-22.04
container:
image: "ubuntu:22.04"
Expand All @@ -118,52 +27,8 @@ jobs:
git --version
node --version
npm --version
- name: Validate current commit (last commit) with commitlint
if: github.event_name == 'push'
run: ./commitlint.sh --from HEAD~1 --to HEAD --verbose
- name: Validate PR commits with commitlint
if: github.event_name == 'pull_request'
run: |
./commitlint.sh --verbose \
--from ${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }} \
--to ${{ github.event.pull_request.head.sha }}
- name: Install dotnet sdk
run: sudo apt install --yes dotnet6
- name: Check all files end with EOL
run: dotnet fsi scripts/eofConvention.fsx
- name: Check all .fsx scripts have shebang
run: dotnet fsi scripts/shebangConvention.fsx
- name: Check there are no mixed line-endings in any files
run: dotnet fsi scripts/mixedLineEndings.fsx
- name: Check there are no unpinned GitHubActions image versions
run: dotnet fsi scripts/unpinnedGitHubActionsImageVersions.fsx
- name: Check there are no unpinned dotnet package versions
run: dotnet fsi scripts/unpinnedDotnetPackageVersions.fsx
- name: Check there are no unpinned nuget package reference versions in F# scripts
run: dotnet fsi scripts/unpinnedNugetPackageReferenceVersions.fsx
- name: Check if gitPush1by1 was used
if: github.event_name == 'pull_request'
run: dotnet fsi scripts/detectNotUsingGitPush1by1.fsx
- name: Install prettier
run: npm install prettier@2.8.3
- name: Change file permissions
# We need this step so we can change the files using `npx prettier --write` in the next step.
# Otherwise we get permission denied error in the CI.
run: sudo chmod 777 -R .
- name: Run "prettier" to check the style of our TypeScript and YML code
run: |
sudo npx prettier --quote-props=consistent --write './**/*.ts'
sudo npx prettier --quote-props=consistent --write './**/*.yml'
# Since we changed file modes in the previous step we need the following command to
# make git ignore mode changes in files and doesn't include them in the git diff command.
git config core.fileMode false
# Since after installing commitlint dependencies package.json file changes, we need to
# run the following command to ignore package.json file
git restore package.json
git diff --exit-code
- name: fantomless
run: |
dotnet new tool-manifest
dotnet tool install fantomless-tool --version 4.7.997-prerelease
dotnet fantomless --recurse .
git diff --exit-code
36 changes: 33 additions & 3 deletions scripts/detectNotUsingGitPush1by1.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,26 @@ if String.IsNullOrEmpty githubEventPath then

Environment.Exit 2

(*
To save your GitHub access token as an environment variable in GitHub
Actions, you can use the secrets feature in GitHub. In your GitHub Actions
workflow file, you can reference the secret as an environment variable using
the syntax ${{ secrets.GITHUB_TOKEN }}. For example:

```
name: My Workflow

on: [push, pull_request]

jobs:
my_job:
runs-on: ubuntu-latest
env:
ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
```
*)
let accessToken = Environment.GetEnvironmentVariable "ACCESS_TOKEN"

type githubEventType =
JsonProvider<"""
{
Expand Down Expand Up @@ -779,7 +799,7 @@ type PRCommitsType =
]
""">

let GitHubApiCall(url: string) =
let GitHubApiCall (url: string) (accessToken: string) =
let userAgent = ".NET App"
let xGitHubApiVersion = "2022-11-28"

Expand All @@ -794,14 +814,24 @@ let GitHubApiCall(url: string) =
client.DefaultRequestHeaders.Add("User-Agent", userAgent)
client.DefaultRequestHeaders.Add("X-GitHub-Api-Version", xGitHubApiVersion)

if not(String.IsNullOrEmpty accessToken) then
client.DefaultRequestHeaders.Add(
"Authorization",
$"token {accessToken}"
)

(client.GetStringAsync url).Result

let prCommits =
let url = parsedJsonObj.PullRequest.Links.Commits.Href
let prCommitsJsonString = GitHubApiCall url

let prCommitsJsonString = GitHubApiCall url accessToken

let parsedPrCommitsJsonObj = PRCommitsType.Parse prCommitsJsonString
parsedPrCommitsJsonObj |> Seq.map(fun commit -> commit.Sha)

printfn "prCommits:%A" prCommits

let notUsingGitPush1by1 =
prCommits
|> Seq.map(fun commit ->
Expand All @@ -812,7 +842,7 @@ let notUsingGitPush1by1 =
gitRepo
commit

let json = GitHubApiCall url
let json = GitHubApiCall url accessToken

json.Contains "\"check_suites\":[]"
)
Expand Down