Skip to content

Commit

Permalink
Use main branches in github actions to stay up to date
Browse files Browse the repository at this point in the history
  • Loading branch information
arburk committed Feb 24, 2024
1 parent ee57394 commit 75d1a4f
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
distribution: 'temurin'
java-version: 17
- name: Cache Maven packages
uses: actions/cache@v3
uses: actions/cache@main
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,25 @@ jobs:
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Cache Maven packages
uses: actions/cache@v3
uses: actions/cache@main
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@main
with:
languages: ${{ matrix.language }}
queries: security-and-quality
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@main
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@main

- name: Archive codeQl result
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@main
with:
name: Code-QL result (sarif file)
path: /home/runner/work/codeql2sonar-maven-plugin/results/*.sarif
Expand All @@ -68,7 +68,7 @@ jobs:
mvn -B codeql2sonar:SonarIssueReporter -Dcodeql2sonar.sarif.inputfile=/home/runner/work/codeql2sonar-maven-plugin/results/java.sarif -Dcodeql2sonar.sarif.ignoreTests=true -Dcodeql2sonar.sarif.outputfile=/home/runner/work/codeql2sonar-maven-plugin/results/sonar-cql-issues.json
- name: Archive conversion result
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@main
with:
name: conversion result (json file)
path: /home/runner/work/codeql2sonar-maven-plugin/results/sonar-cql-issues.json
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/docker-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,27 @@ on:

defaults:
run:
working-directory: ./docker/ # docker/build-push-action@v2 is not applying a working-directory
working-directory: ./docker/ # docker/build-push-action@main is not applying a working-directory

jobs:
docker:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@main

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@main

- name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@main
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push
id: docker_build
uses: docker/build-push-action@v3
uses: docker/build-push-action@main
with:
context: ./docker/
push: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
echo tag_ref=$TAG_REF >> $GITHUB_ENV
- name: Checkout tag ${{ env.tag_ref }}
uses: actions/checkout@v3
uses: actions/checkout@main
with:
ref: ${{ env.tag_ref }}

Expand Down

0 comments on commit 75d1a4f

Please sign in to comment.