Compare commits

..

No commits in common. "85756c2fffd32eb1fb5af4bed2a52a4a208fbc09" and "02f224cd4cd5fd294752f1465aa2c3309e731131" have entirely different histories.

2 changed files with 14 additions and 5 deletions

View File

@ -5,6 +5,17 @@ on:
tags: tags:
- 'v*' - 'v*'
jobs: jobs:
PullDocker:
runs-on: [ubuntu-latest, ubuntu-24.04]
steps:
- name: Login to Docker Registry
uses: docker/login-action@v2
with:
registry: frp-by1.wwvvww.cn:45288
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Pull Docker image
run: docker pull frp-by1.wwvvww.cn:45288/ubuntu_dev:22.04
Build: Build:
runs-on: [ubuntu-latest, ubuntu-24.04] runs-on: [ubuntu-latest, ubuntu-24.04]
container: container:
@ -18,9 +29,7 @@ jobs:
- name: Generate Changelog - name: Generate Changelog
run: | run: |
set -eux set -eux
echo "gdgd" resources/build.sh
git log $(git describe --tags --abbrev=0 $(git rev-list --tags --skip=1 --max-count=1))..$(git describe --tags --abbrev=0) --reverse --pretty=format:"%B"
git log $(git describe --tags --abbrev=0 $(git rev-list --tags --skip=1 --max-count=1))..$(git describe --tags --abbrev=0) --reverse --pretty=format:"%B" | nl -w2 -s". "
git log $(git describe --tags --abbrev=0 $(git rev-list --tags --skip=1 --max-count=1))..$(git describe --tags --abbrev=0) --reverse --pretty=format:"%B" | nl -w2 -s". " > ${{ github.workspace }}-CHANGELOG.txt git log $(git describe --tags --abbrev=0 $(git rev-list --tags --skip=1 --max-count=1))..$(git describe --tags --abbrev=0) --reverse --pretty=format:"%B" | nl -w2 -s". " > ${{ github.workspace }}-CHANGELOG.txt
- name: Upload Gitea Release - name: Upload Gitea Release
uses: akkuman/gitea-release-action@v1 uses: akkuman/gitea-release-action@v1

View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
set -eux
function changelog(){ function changelog(){
current_tag=$(git describe --tags --abbrev=0) current_tag=$(git describe --tags --abbrev=0)
previous_tag=$(git describe --tags --abbrev=0 $(git rev-list --tags --skip=1 --max-count=1)) previous_tag=$(git describe --tags --abbrev=0 $(git rev-list --tags --skip=1 --max-count=1))
git log ${previous_tag}..${current_tag} --reverse --pretty=format:"%B" | nl -w2 -s". " > CHANGELOG.txt git log ${previous_tag}..${current_tag} --reverse --pretty=format:"%B" | nl -w2 -s". " > CHANGELOG.txt