Skip to content

Commit

Permalink
Bump senzing-factory/build-resources from 1 to 2 (#14)
Browse files Browse the repository at this point in the history
* Bump senzing-factory/build-resources from 1 to 2

Bumps [senzing-factory/build-resources](https://github.com/senzing-factory/build-resources) from 1 to 2.
- [Release notes](https://github.com/senzing-factory/build-resources/releases)
- [Changelog](https://github.com/senzing-factory/build-resources/blob/main/CHANGELOG.md)
- [Commits](senzing-factory/build-resources@v1...v2)

---
updated-dependencies:
- dependency-name: senzing-factory/build-resources
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix linting

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sam <109683132+kernelsam@users.noreply.github.com>
  • Loading branch information
dependabot[bot] and kernelsam authored Jun 6, 2024
1 parent 6eabd76 commit 44ac180
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/add-labels-standardized.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ jobs:
secrets:
ORG_MEMBERSHIP_TOKEN: ${{ secrets.ORG_MEMBERSHIP_TOKEN }}
SENZING_MEMBERS: ${{ secrets.SENZING_MEMBERS }}
uses: senzing-factory/build-resources/.github/workflows/add-labels-to-issue.yaml@v1
uses: senzing-factory/build-resources/.github/workflows/add-labels-to-issue.yaml@v2
5 changes: 4 additions & 1 deletion .github/workflows/add-to-project-factory-dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@ on:
pull_request:
branches: [main]

permissions:
repository-projects: write

jobs:
add-to-project-dependabot:
secrets:
SENZING_GITHUB_PROJECT_RW_TOKEN: ${{ secrets.SENZING_GITHUB_PROJECT_RW_TOKEN }}
uses: senzing-factory/build-resources/.github/workflows/add-to-project-dependabot.yaml@v1
uses: senzing-factory/build-resources/.github/workflows/add-to-project-dependabot.yaml@v2
with:
project: ${{ vars.SENZING_PROJECT_FACTORY }}
2 changes: 1 addition & 1 deletion .github/workflows/add-to-project-factory.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
add-to-project:
secrets:
SENZING_GITHUB_PROJECT_RW_TOKEN: ${{ secrets.SENZING_GITHUB_PROJECT_RW_TOKEN }}
uses: senzing-factory/build-resources/.github/workflows/add-to-project.yaml@v1
uses: senzing-factory/build-resources/.github/workflows/add-to-project.yaml@v2
with:
classic: false
project-number: ${{ vars.SENZING_PROJECT_FACTORY }}
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/docker-build-container.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: docker build container

on: [push]

permissions:
contents: read

jobs:
docker-build-container:
runs-on: ubuntu-latest
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/lint-repo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ on:
pull_request:
branches: [main]

permissions:
contents: read
packages: read
pull-requests: read
statuses: write

jobs:
lint-code-base:
uses: senzing-factory/build-resources/.github/workflows/linter.yaml@v1
uses: senzing-factory/build-resources/.github/workflows/linter.yaml@v2
2 changes: 1 addition & 1 deletion .github/workflows/move-pr-to-done-dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ jobs:
move-pr-to-done-dependabot:
secrets:
SENZING_GITHUB_PROJECT_RW_TOKEN: ${{ secrets.SENZING_GITHUB_PROJECT_RW_TOKEN }}
uses: senzing-factory/build-resources/.github/workflows/move-pr-to-done-dependabot.yaml@v1
uses: senzing-factory/build-resources/.github/workflows/move-pr-to-done-dependabot.yaml@v2
with:
project: ${{ vars.SENZING_PROJECT_FACTORY }}
18 changes: 11 additions & 7 deletions build/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ ARG GITHUB_EVENT_NAME="push"

# Add github
RUN apk update && \
apk upgrade && \
apk add --no-cache \
git \
make
apk upgrade && \
apk add --no-cache \
git \
make

WORKDIR /go/src

Expand All @@ -21,9 +21,9 @@ RUN git clone https://github.com/senzing/git-action-slack-notification.git
# merging master into branch.
WORKDIR /go/src/git-action-slack-notification
RUN git checkout ${GITHUB_HEAD_REF}; \
if [[ "${GITHUB_HEAD_REF}" != "master" && ${GITHUB_EVENT_NAME} == "pull_request" ]]; then \
git merge master; \
fi
if [[ "${GITHUB_HEAD_REF}" != "master" && ${GITHUB_EVENT_NAME} == "pull_request" ]]; then \
git merge master; \
fi

# Building go app
RUN make build
Expand All @@ -42,4 +42,8 @@ COPY --from=BUILD /go/bin/git-action-slack-notification /usr/bin
COPY --from=BUILD /go/src/git-action-slack-notification/LICENSE /
COPY --from=BUILD /go/src/git-action-slack-notification/README.md /

HEALTHCHECK CMD git --version || exit 1

USER 1001

ENTRYPOINT ["git-action-slack-notification"]

0 comments on commit 44ac180

Please sign in to comment.